Merge pull request #26 from Martin-Molinero/performance-qc2925-fix-exception-cache

 Remove ExceptionTypeCache

Author: jaredbroad

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.5.16
+current_version = 1.0.5.17
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
 serialize = 
 	{major}.{minor}.{patch}.{release}{dev}

conda.recipe/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: pythonnet
-  version: "1.0.5.16"
+  version: "1.0.5.17"
 
 build:
   skip: True  # [not win]

setup.py

@@ -485,7 +485,7 @@ def run(self):
 
 setup(
     name="pythonnet",
-    version="1.0.5.16",
+    version="1.0.5.17",
     description=".Net and Mono integration for Python",
     url='https://pythonnet.github.io/',
     license='MIT',

src/SharedAssemblyInfo.cs

@@ -25,4 +25,4 @@
 // Version Information. Keeping it simple. May need to revisit for Nuget
 // See: https://codingforsmarties.wordpress.com/2016/01/21/how-to-version-assemblies-destined-for-nuget/
 // AssemblyVersion can only be numeric
-[assembly: AssemblyVersion("1.0.5.16")]
+[assembly: AssemblyVersion("1.0.5.17")]

src/clrmodule/ClrModule.cs

@@ -53,7 +53,7 @@ public static void initclr()
         {
 #if USE_PYTHON_RUNTIME_VERSION
             // Has no effect until SNK works. Keep updated anyways.
-            Version = new Version("1.0.5.16"),
+            Version = new Version("1.0.5.17"),
 #endif
             CultureInfo = CultureInfo.InvariantCulture
         };

src/runtime/interop.cs

@@ -125,20 +125,13 @@ public static int Size(IntPtr ob)
         public static int ob_type;
         private static int ob_dict;
         private static int ob_data;
-        private static readonly Dictionary<IntPtr, bool> ExceptionTypeCache = new Dictionary<IntPtr, bool>();
 
         private static bool IsException(IntPtr pyObject)
         {
-            bool res;
             var type = Runtime.PyObject_TYPE(pyObject);
-            if (!ExceptionTypeCache.TryGetValue(type, out res))
-            {
-                res = Runtime.PyObjectType_TypeCheck(type, Exceptions.BaseException)
-                    || Runtime.PyObjectType_TypeCheck(type, Runtime.PyTypeType)
-                    && Runtime.PyType_IsSubtype(pyObject, Exceptions.BaseException);
-                ExceptionTypeCache.Add(type, res);
-            }
-            return res;
+            return Runtime.PyObjectType_TypeCheck(type, Exceptions.BaseException)
+                || Runtime.PyObjectType_TypeCheck(type, Runtime.PyTypeType)
+                && Runtime.PyType_IsSubtype(pyObject, Exceptions.BaseException);
         }
     }
 

src/runtime/resources/clr.py

@@ -2,7 +2,7 @@
 Code in this module gets loaded into the main clr module.
 """
 
-__version__ = "1.0.5.16"
+__version__ = "1.0.5.17"
 
 
 class clrproperty(object):