From d2825263c1cdb16c542a1a642140cb90f46f45db Mon Sep 17 00:00:00 2001
From: ecpost <16603401+ecpost@users.noreply.github.com>
Date: Wed, 24 Aug 2022 20:33:47 -0700
Subject: [PATCH 1/2] Modify the new 3.10.6 version of platform.py to work with
 platform.rs

---
 Lib/platform.py           | 12 +++++-------
 Lib/test/test_platform.py |  2 ++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Lib/platform.py b/Lib/platform.py
index fe88fa9d5..33234179c 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1065,13 +1065,7 @@ def _sys_version(sys_version=None):
                 repr(sys_version))
         version, buildno, builddate, buildtime, compiler = \
               match.groups()
-
-        # XXX: RUSTPYTHON support
-        if "rustc" in sys_version:
-            name = "RustPython"
-        else:
-            name = 'CPython'
-
+        name = 'CPython'
         if builddate is None:
             builddate = ''
         elif buildtime:
@@ -1308,6 +1302,10 @@ def freedesktop_os_release():
     return _os_release_cache.copy()
 
 
+# RustPython specific
+from _platform import *
+
+
 ### Command line interface
 
 if __name__ == '__main__':
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 82d3e82c8..2e16c6570 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -121,6 +121,8 @@ class PlatformTest(unittest.TestCase):
         sys._git = self.save_git
         sys.platform = self.save_platform
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_sys_version(self):
         # Old test.
         for input, output in (

From e400c60ed8190e564750e67f8c17a67ce870f99e Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Sat, 3 Sep 2022 23:25:46 +0900
Subject: [PATCH 2/2] Remove _platform RustPython-only module

---
 Lib/platform.py           | 12 +++++++-----
 Lib/test/test_platform.py |  2 --
 stdlib/src/lib.rs         |  2 --
 stdlib/src/platform.rs    | 36 ------------------------------------
 4 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 stdlib/src/platform.rs

diff --git a/Lib/platform.py b/Lib/platform.py
index 33234179c..fe88fa9d5 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1065,7 +1065,13 @@ def _sys_version(sys_version=None):
                 repr(sys_version))
         version, buildno, builddate, buildtime, compiler = \
               match.groups()
-        name = 'CPython'
+
+        # XXX: RUSTPYTHON support
+        if "rustc" in sys_version:
+            name = "RustPython"
+        else:
+            name = 'CPython'
+
         if builddate is None:
             builddate = ''
         elif buildtime:
@@ -1302,10 +1308,6 @@ def freedesktop_os_release():
     return _os_release_cache.copy()
 
 
-# RustPython specific
-from _platform import *
-
-
 ### Command line interface
 
 if __name__ == '__main__':
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 2e16c6570..82d3e82c8 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -121,8 +121,6 @@ class PlatformTest(unittest.TestCase):
         sys._git = self.save_git
         sys.platform = self.save_platform
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_sys_version(self):
         # Old test.
         for input, output in (
diff --git a/stdlib/src/lib.rs b/stdlib/src/lib.rs
index f85f1a363..b8b6ee359 100644
--- a/stdlib/src/lib.rs
+++ b/stdlib/src/lib.rs
@@ -18,7 +18,6 @@ mod json;
 mod math;
 #[cfg(unix)]
 mod mmap;
-mod platform;
 mod pyexpat;
 mod pystruct;
 mod random;
@@ -100,7 +99,6 @@ pub fn get_module_inits() -> impl Iterator<Item = (Cow<'static, str>, StdlibInit
             "_json" => json::make_module,
             "math" => math::make_module,
             "pyexpat" => pyexpat::make_module,
-            "_platform" => platform::make_module,
             "_random" => random::make_module,
             "_statistics" => statistics::make_module,
             "_struct" => pystruct::make_module,
diff --git a/stdlib/src/platform.rs b/stdlib/src/platform.rs
deleted file mode 100644
index c700fc835..000000000
--- a/stdlib/src/platform.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-pub(crate) use decl::make_module;
-
-#[pymodule(name = "platform")]
-mod decl {
-    use crate::vm::{version, VirtualMachine};
-
-    #[pyfunction]
-    fn python_implementation(_vm: &VirtualMachine) -> String {
-        "RustPython".to_owned()
-    }
-
-    #[pyfunction]
-    fn python_version(_vm: &VirtualMachine) -> String {
-        version::get_version_number()
-    }
-
-    #[pyfunction]
-    fn python_compiler(_vm: &VirtualMachine) -> String {
-        version::get_compiler()
-    }
-
-    #[pyfunction]
-    fn python_build(_vm: &VirtualMachine) -> (String, String) {
-        (version::get_git_identifier(), version::get_git_datetime())
-    }
-
-    #[pyfunction]
-    fn python_branch(_vm: &VirtualMachine) -> String {
-        version::get_git_branch()
-    }
-
-    #[pyfunction]
-    fn python_revision(_vm: &VirtualMachine) -> String {
-        version::get_git_revision()
-    }
-}