revert exceptions.cs and runtime.cs as the changes in them aren't

tonyroberts · tonyroberts · commit c122b621e1ad · 2014-09-15T13:07:08.000+01:00
necessary
diff --git a/pythonnet/src/runtime/exceptions.cs b/pythonnet/src/runtime/exceptions.cs
@@ -222,21 +222,12 @@ 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 {0}\n" +
-            "class Exception({0}.Exception):\n" +
+            "import exceptions\n" +
+            "class Exception(exceptions.Exception):\n" +
             "    _class = None\n" +
             "    _inner = None\n" +
             "    \n" +
@@ -248,7 +239,7 @@ internal static void SetupExceptionHack() {
             "    def __init__(self, *args, **kw):\n" +
             "        inst = self.__class__._class(*args, **kw)\n" +
             "        self.__dict__['_inner'] = inst\n" +
-            "        {0}.Exception.__init__(self, *args, **kw)\n" +
+            "        exceptions.Exception.__init__(self, *args, **kw)\n" +
             "\n" +
             "    def __getattr__(self, name, _marker=[]):\n" +
             "        inner = self.__dict__['_inner']\n" +
@@ -277,8 +268,6 @@ 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/runtime.cs b/pythonnet/src/runtime/runtime.cs
@@ -199,18 +199,10 @@ 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(
-#if(PYTHON34)
-            "builtins"
-#else
-            "exceptions"
-#endif
-            );
-
+        IntPtr m = PyImport_ImportModule("exceptions");
         Exceptions.ErrorCheck(m);
         op = Runtime.PyObject_GetAttrString(m, "Exception");
         Exceptions.ErrorCheck(op);
