Merge pull request #4646 from dalinaum/winver

youknowone · web-flow · commit 26a3ec9ae357 · 2023-03-07T00:19:00.000+09:00
Add sys.winver
diff --git a/vm/src/stdlib/sys.rs b/vm/src/stdlib/sys.rs
@@ -262,6 +262,13 @@ mod sys {
         version::get_version()
     }
 
+    #[cfg(windows)]
+    #[pyattr]
+    fn winver(_vm: &VirtualMachine) -> String {
+        // Note: This is Python DLL version in CPython, but we arbitrary fill it for compatibility
+        version::get_winver_number()
+    }
+
     #[pyattr]
     fn _xoptions(vm: &VirtualMachine) -> PyDictRef {
         let ctx = &vm.ctx;
diff --git a/vm/src/version.rs b/vm/src/version.rs
@@ -28,6 +28,10 @@ pub fn get_version_number() -> String {
     format!("{MAJOR}.{MINOR}.{MICRO}{RELEASELEVEL}")
 }
 
+pub fn get_winver_number() -> String {
+    format!("{MAJOR}.{MINOR}")
+}
+
 pub fn get_compiler() -> String {
     format!("rustc {}", env!("RUSTC_VERSION"))
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,10 @@ pub fn get_version_number() -> String {`
`28`	`28`	`format!("{MAJOR}.{MINOR}.{MICRO}{RELEASELEVEL}")`
`29`	`29`	`}`
`30`	`30`
	`31`	`+pub fn get_winver_number() -> String {`
	`32`	`+ format!("{MAJOR}.{MINOR}")`
	`33`	`+}`
	`34`	`+`
`31`	`35`	`pub fn get_compiler() -> String {`
`32`	`36`	`format!("rustc {}", env!("RUSTC_VERSION"))`
`33`	`37`	`}`