fix an issue with Python 3.4, it does not crash anynore when throwing an exception

sdpython · tonyroberts · commit 201137aff28a · 2014-09-15T13:07:08.000+01:00
diff --git a/pythonnet/src/runtime/exceptions.cs b/pythonnet/src/runtime/exceptions.cs
@@ -222,12 +222,21 @@ internal unsafe static void ErrorOccurredCheck(IntPtr pointer) {
         ///  
         /// </remarks>
         internal static void SetupExceptionHack() {
+            DebugUtil.Print("SetupExceptionHack");
             ns_exc = ClassManager.GetClass(typeof(Exception)).pyHandle;
             cache = new Hashtable();
 
+            string module_exception =
+#if(PYTHON34)
+                "builtins"
+#else
+                "exceptions"
+#endif
+                ;
+
             string code = 
-            "import exceptions\n" +
-            "class Exception(exceptions.Exception):\n" +
+            "import {0}\n" +
+            "class Exception({0}.Exception):\n" +
             "    _class = None\n" +
             "    _inner = None\n" +
             "    \n" +
@@ -239,7 +248,7 @@ internal static void SetupExceptionHack() {
             "    def __init__(self, *args, **kw):\n" +
             "        inst = self.__class__._class(*args, **kw)\n" +
             "        self.__dict__['_inner'] = inst\n" +
-            "        exceptions.Exception.__init__(self, *args, **kw)\n" +
+            "        {0}.Exception.__init__(self, *args, **kw)\n" +
             "\n" +
             "    def __getattr__(self, name, _marker=[]):\n" +
             "        inner = self.__dict__['_inner']\n" +
@@ -268,6 +277,8 @@ internal static void SetupExceptionHack() {
             "        name = self.__class__.__name__\n" +
             "        return '%s(\\'%s\\',)' % (name, msg) \n" +
             "\n";
+            code = string.Format(code, module_exception);
+            DebugUtil.Print(code);
 
             IntPtr dict = Runtime.PyDict_New();
 
diff --git a/pythonnet/src/runtime/interop.cs b/pythonnet/src/runtime/interop.cs
@@ -79,7 +79,7 @@ static ObjectOffset() {
         }
 
         public static int magic(IntPtr ob) {
-#if (PYTHON32 || PYTHON33 || PYTHON33)
+#if (PYTHON32 || PYTHON33 || PYTHON34)
             if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) ||
                 (Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))
             {
@@ -91,7 +91,7 @@ public static int magic(IntPtr ob) {
 
         public static int DictOffset(IntPtr ob)
         {
-#if (PYTHON32 || PYTHON33 || PYTHON33)
+#if (PYTHON32 || PYTHON33 || PYTHON34)
             if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) ||
                 (Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))
             {
@@ -102,7 +102,7 @@ public static int DictOffset(IntPtr ob)
         }
 
         public static int Size(IntPtr ob) {
-#if (PYTHON32 || PYTHON33 || PYTHON33)
+#if (PYTHON32 || PYTHON33 || PYTHON34)
             if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) ||
                 (Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))
             {
diff --git a/pythonnet/src/runtime/runtime.cs b/pythonnet/src/runtime/runtime.cs
@@ -199,10 +199,18 @@ internal static void Initialize() {
         // of the Python runtime that do not allow new-style classes to
         // be used as exceptions (Python versions 2.4 and lower).
 
-#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34)
+#if (PYTHON25 || PYTHON26 || PYTHON27 || PYTHON32 || PYTHON33 || PYTHON34 )
         wrap_exceptions = false;
 #else
-        IntPtr m = PyImport_ImportModule("exceptions");
+
+        IntPtr m = PyImport_ImportModule(
+#if(PYTHON34)
+            "builtins"
+#else
+            "exceptions"
+#endif
+            );
+
         Exceptions.ErrorCheck(m);
         op = Runtime.PyObject_GetAttrString(m, "Exception");
         Exceptions.ErrorCheck(op);

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ static ObjectOffset() {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public static int magic(IntPtr ob) {`
`82`		`-#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON33)`
	`82`	`+#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON34)`
`83`	`83`	`if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) \|\|`
`84`	`84`	`(Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))`
`85`	`85`	`{`
`@@ -91,7 +91,7 @@ public static int magic(IntPtr ob) {`
`91`	`91`
`92`	`92`	`public static int DictOffset(IntPtr ob)`
`93`	`93`	`{`
`94`		`-#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON33)`
	`94`	`+#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON34)`
`95`	`95`	`if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) \|\|`
`96`	`96`	`(Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))`
`97`	`97`	`{`
`@@ -102,7 +102,7 @@ public static int DictOffset(IntPtr ob)`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`public static int Size(IntPtr ob) {`
`105`		`-#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON33)`
	`105`	`+#if (PYTHON32 \|\| PYTHON33 \|\| PYTHON34)`
`106`	`106`	`if ((Runtime.PyObject_TypeCheck(ob, Exceptions.BaseException) \|\|`
`107`	`107`	`(Runtime.PyType_Check(ob) && Runtime.PyType_IsSubtype(ob, Exceptions.BaseException))))`
`108`	`108`	`{`