Implement __version__ on clr module

vmuriart · vmuriart · commit f74898c598e5 · 2017-01-07T14:49:55.000-07:00
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -446,11 +446,5 @@ public static int _AtExit()
         {
             return Runtime.AtExit();
         }
-
-        [ModuleFunctionAttribute()]
-        public static string Version()
-        {
-            return "2.2.0";
-        }
     }
 }
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -165,7 +165,7 @@ public static void Initialize()
                     Runtime.PyDict_SetItemString(clr_dict, "_extras", module);
                     foreach (PyObject key in locals.Keys())
                     {
-                        if (!key.ToString().StartsWith("_"))
+                        if (!key.ToString().StartsWith("_") || key.ToString().Equals("__version__"))
                         {
                             PyObject value = locals[key];
                             Runtime.PyDict_SetItem(clr_dict, key.Handle, value.Handle);
diff --git a/src/runtime/resources/clr.py b/src/runtime/resources/clr.py
@@ -1,7 +1,9 @@
-﻿"""
+"""
 Code in this module gets loaded into the main clr module.
 """
 
+__version__ = "2.2.0"
+
 
 class clrproperty(object):
     """
diff --git a/src/tests/test_module.py b/src/tests/test_module.py
@@ -43,7 +43,7 @@ def test000importClr(self):
 
     def testVersionClr(self):
         import clr
-        self.assertTrue(clr.Version() >= "2.2.0")
+        self.assertTrue(clr.__version__ >= "2.2.0")
 
     def testPreloadVar(self):
         import clr

Original file line number	Diff line number	Diff line change
`@@ -446,11 +446,5 @@ public static int _AtExit()`
`446`	`446`	`{`
`447`	`447`	`return Runtime.AtExit();`
`448`	`448`	`}`
`449`		`-`
`450`		`- [ModuleFunctionAttribute()]`
`451`		`- public static string Version()`
`452`		`- {`
`453`		`- return "2.2.0";`
`454`		`- }`
`455`	`449`	`}`
`456`	`450`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public static void Initialize()`
`165`	`165`	`Runtime.PyDict_SetItemString(clr_dict, "_extras", module);`
`166`	`166`	`foreach (PyObject key in locals.Keys())`
`167`	`167`	`{`
`168`		`- if (!key.ToString().StartsWith("_"))`
	`168`	`+ if (!key.ToString().StartsWith("_") \|\| key.ToString().Equals("__version__"))`
`169`	`169`	`{`
`170`	`170`	`PyObject value = locals[key];`
`171`	`171`	`Runtime.PyDict_SetItem(clr_dict, key.Handle, value.Handle);`