pythonnet
diff --git a/‎src/runtime/runtime.cs
Lines changed: 2 additions & 6 deletions b/‎src/runtime/runtime.cs
Lines changed: 2 additions & 6 deletions
diff --git a/‎src/tests/test_exceptions.py
Lines changed: 1 addition & 1 deletion b/‎src/tests/test_exceptions.py
Lines changed: 1 addition & 1 deletion
@@ -227,9 +227,6 @@ internal static void Initialize(bool initSigs = false, bool softShutdown = false
 
                 SetPyMember(ref PySuper_Type, PyObject_GetAttrString(builtins, "super"));
 
-                op = PyObject_GetAttrString(builtins, "KeyError");
-                SetPyMember(ref PyExc_KeyError, op);
-
                 XDecref(builtins);
             }
 
 
             fn = PyObject_GetAttrString(platformModule, "system");
             op = PyObject_Call(fn, emptyTuple, IntPtr.Zero);
+            PythonException.ThrowIfIsNull(op);
             OperatingSystemName = GetManagedString(op);
             XDecref(op);
             XDecref(fn);
@@ -470,7 +468,7 @@ private static void PyDictTryDelItem(IntPtr dict, string key)
             {
                 return;
             }
-            if (!PythonException.Matches(PyExc_KeyError))
+            if (!PythonException.Matches(Exceptions.KeyError))
             {
                 throw new PythonException();
             }
@@ -541,8 +539,6 @@ private static void MoveClrInstancesOnwershipToPython()
         internal static IntPtr PyNone;
         internal static IntPtr Error;
 
-        internal static IntPtr PyExc_KeyError;
-
         /// <summary>
         /// Check if any Python Exceptions occurred.
         /// If any exist throw new PythonException.
 
@@ -286,7 +286,7 @@ def test_python_compat_of_managed_exceptions():
         strexp = "OverflowException('Simple message"
         assert repr(e)[:len(strexp)] == strexp
     elif PY2:
-        assert repr(e) == "OverflowException(u'Simple message',)"
+        assert repr(e) == "OverflowException('Simple message',)"
 
 
 def test_exception_is_instance_of_system_object():
Original file line number	Diff line number	Diff line change
`@@ -227,9 +227,6 @@ internal static void Initialize(bool initSigs = false, bool softShutdown = false`
`227`	`227`
`228`	`228`	`SetPyMember(ref PySuper_Type, PyObject_GetAttrString(builtins, "super"));`
`229`	`229`
`230`		`- op = PyObject_GetAttrString(builtins, "KeyError");`
`231`		`- SetPyMember(ref PyExc_KeyError, op);`
`232`		`-`
`233`	`230`	`XDecref(builtins);`
`234`	`231`	`}`
`235`	`232`
`@@ -345,6 +342,7 @@ private static void InitializePlatformData()`
`345`	`342`
`346`	`343`	`fn = PyObject_GetAttrString(platformModule, "system");`
`347`	`344`	`op = PyObject_Call(fn, emptyTuple, IntPtr.Zero);`
	`345`	`+ PythonException.ThrowIfIsNull(op);`
`348`	`346`	`OperatingSystemName = GetManagedString(op);`
`349`	`347`	`XDecref(op);`
`350`	`348`	`XDecref(fn);`
`@@ -470,7 +468,7 @@ private static void PyDictTryDelItem(IntPtr dict, string key)`
`470`	`468`	`{`
`471`	`469`	`return;`
`472`	`470`	`}`
`473`		`- if (!PythonException.Matches(PyExc_KeyError))`
	`471`	`+ if (!PythonException.Matches(Exceptions.KeyError))`
`474`	`472`	`{`
`475`	`473`	`throw new PythonException();`
`476`	`474`	`}`
`@@ -541,8 +539,6 @@ private static void MoveClrInstancesOnwershipToPython()`
`541`	`539`	`internal static IntPtr PyNone;`
`542`	`540`	`internal static IntPtr Error;`
`543`	`541`
`544`		`- internal static IntPtr PyExc_KeyError;`
`545`		`-`
`546`	`542`	`/// <summary>`
`547`	`543`	`/// Check if any Python Exceptions occurred.`
`548`	`544`	`/// If any exist throw new PythonException.`