Refactor Exception checking on tested classes

vmuriart · vmuriart · commit 6e4cf9d0fc44 · 2017-03-05T19:36:27.000-07:00
diff --git a/src/runtime/pyansistring.cs b/src/runtime/pyansistring.cs
@@ -45,10 +45,7 @@ public PyAnsiString(PyObject o)
         public PyAnsiString(string s)
         {
             obj = Runtime.PyString_FromString(s);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
diff --git a/src/runtime/pyfloat.cs b/src/runtime/pyfloat.cs
@@ -51,10 +51,7 @@ public PyFloat(PyObject o)
         public PyFloat(double value)
         {
             obj = Runtime.PyFloat_FromDouble(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -69,10 +66,7 @@ public PyFloat(string value)
             using (var s = new PyString(value))
             {
                 obj = Runtime.PyFloat_FromString(s.obj, IntPtr.Zero);
-                if (obj == IntPtr.Zero)
-                {
-                    throw new PythonException();
-                }
+                Runtime.CheckExceptionOccurred();
             }
         }
 
@@ -100,10 +94,7 @@ public static bool IsFloatType(PyObject value)
         public static PyFloat AsFloat(PyObject value)
         {
             IntPtr op = Runtime.PyNumber_Float(value.obj);
-            if (op == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
             return new PyFloat(op);
         }
     }
diff --git a/src/runtime/pyint.cs b/src/runtime/pyint.cs
@@ -51,10 +51,7 @@ public PyInt(PyObject o)
         public PyInt(int value)
         {
             obj = Runtime.PyInt_FromInt32(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -68,10 +65,7 @@ public PyInt(int value)
         public PyInt(uint value) : base(IntPtr.Zero)
         {
             obj = Runtime.PyInt_FromInt64(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -84,10 +78,7 @@ public PyInt(uint value) : base(IntPtr.Zero)
         public PyInt(long value) : base(IntPtr.Zero)
         {
             obj = Runtime.PyInt_FromInt64(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -101,10 +92,7 @@ public PyInt(long value) : base(IntPtr.Zero)
         public PyInt(ulong value) : base(IntPtr.Zero)
         {
             obj = Runtime.PyInt_FromInt64((long)value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -163,10 +151,7 @@ public PyInt(sbyte value) : this((int)value)
         public PyInt(string value)
         {
             obj = Runtime.PyInt_FromString(value, IntPtr.Zero, 0);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -193,10 +178,7 @@ public static bool IsIntType(PyObject value)
         public static PyInt AsInt(PyObject value)
         {
             IntPtr op = Runtime.PyNumber_Int(value.obj);
-            if (op == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
             return new PyInt(op);
         }
 
diff --git a/src/runtime/pylong.cs b/src/runtime/pylong.cs
@@ -51,10 +51,7 @@ public PyLong(PyObject o)
         public PyLong(int value)
         {
             obj = Runtime.PyLong_FromLong(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -68,10 +65,7 @@ public PyLong(int value)
         public PyLong(uint value)
         {
             obj = Runtime.PyLong_FromLong(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -84,10 +78,7 @@ public PyLong(uint value)
         public PyLong(long value)
         {
             obj = Runtime.PyLong_FromLongLong(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -101,10 +92,7 @@ public PyLong(long value)
         public PyLong(ulong value)
         {
             obj = Runtime.PyLong_FromUnsignedLongLong(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -117,10 +105,7 @@ public PyLong(ulong value)
         public PyLong(short value)
         {
             obj = Runtime.PyLong_FromLong(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -134,10 +119,7 @@ public PyLong(short value)
         public PyLong(ushort value)
         {
             obj = Runtime.PyLong_FromLong(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -150,10 +132,7 @@ public PyLong(ushort value)
         public PyLong(byte value)
         {
             obj = Runtime.PyLong_FromLong(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -167,10 +146,7 @@ public PyLong(byte value)
         public PyLong(sbyte value)
         {
             obj = Runtime.PyLong_FromLong(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -183,10 +159,7 @@ public PyLong(sbyte value)
         public PyLong(double value)
         {
             obj = Runtime.PyLong_FromDouble(value);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -199,10 +172,7 @@ public PyLong(double value)
         public PyLong(string value)
         {
             obj = Runtime.PyLong_FromString(value, IntPtr.Zero, 0);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 
@@ -229,10 +199,7 @@ public static bool IsLongType(PyObject value)
         public static PyLong AsLong(PyObject value)
         {
             IntPtr op = Runtime.PyNumber_Long(value.obj);
-            if (op == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
             return new PyLong(op);
         }
 
diff --git a/src/runtime/pystring.cs b/src/runtime/pystring.cs
@@ -54,10 +54,7 @@ public PyString(PyObject o)
         public PyString(string s)
         {
             obj = Runtime.PyUnicode_FromUnicode(s, s.Length);
-            if (obj == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            Runtime.CheckExceptionOccurred();
         }
 
 

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,7 @@ public PyAnsiString(PyObject o)`
`45`	`45`	`public PyAnsiString(string s)`
`46`	`46`	`{`
`47`	`47`	`obj = Runtime.PyString_FromString(s);`
`48`		`- if (obj == IntPtr.Zero)`
`49`		`- {`
`50`		`- throw new PythonException();`
`51`		`- }`
	`48`	`+ Runtime.CheckExceptionOccurred();`
`52`	`49`	`}`
`53`	`50`
`54`	`51`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,7 @@ public PyFloat(PyObject o)`
`51`	`51`	`public PyFloat(double value)`
`52`	`52`	`{`
`53`	`53`	`obj = Runtime.PyFloat_FromDouble(value);`
`54`		`- if (obj == IntPtr.Zero)`
`55`		`- {`
`56`		`- throw new PythonException();`
`57`		`- }`
	`54`	`+ Runtime.CheckExceptionOccurred();`
`58`	`55`	`}`
`59`	`56`
`60`	`57`
`@@ -69,10 +66,7 @@ public PyFloat(string value)`
`69`	`66`	`using (var s = new PyString(value))`
`70`	`67`	`{`
`71`	`68`	`obj = Runtime.PyFloat_FromString(s.obj, IntPtr.Zero);`
`72`		`- if (obj == IntPtr.Zero)`
`73`		`- {`
`74`		`- throw new PythonException();`
`75`		`- }`
	`69`	`+ Runtime.CheckExceptionOccurred();`
`76`	`70`	`}`
`77`	`71`	`}`
`78`	`72`
`@@ -100,10 +94,7 @@ public static bool IsFloatType(PyObject value)`
`100`	`94`	`public static PyFloat AsFloat(PyObject value)`
`101`	`95`	`{`
`102`	`96`	`IntPtr op = Runtime.PyNumber_Float(value.obj);`
`103`		`- if (op == IntPtr.Zero)`
`104`		`- {`
`105`		`- throw new PythonException();`
`106`		`- }`
	`97`	`+ Runtime.CheckExceptionOccurred();`
`107`	`98`	`return new PyFloat(op);`
`108`	`99`	`}`
`109`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,7 @@ public PyInt(PyObject o)`
`51`	`51`	`public PyInt(int value)`
`52`	`52`	`{`
`53`	`53`	`obj = Runtime.PyInt_FromInt32(value);`
`54`		`- if (obj == IntPtr.Zero)`
`55`		`- {`
`56`		`- throw new PythonException();`
`57`		`- }`
	`54`	`+ Runtime.CheckExceptionOccurred();`
`58`	`55`	`}`
`59`	`56`
`60`	`57`
`@@ -68,10 +65,7 @@ public PyInt(int value)`
`68`	`65`	`public PyInt(uint value) : base(IntPtr.Zero)`
`69`	`66`	`{`
`70`	`67`	`obj = Runtime.PyInt_FromInt64(value);`
`71`		`- if (obj == IntPtr.Zero)`
`72`		`- {`
`73`		`- throw new PythonException();`
`74`		`- }`
	`68`	`+ Runtime.CheckExceptionOccurred();`
`75`	`69`	`}`
`76`	`70`
`77`	`71`
`@@ -84,10 +78,7 @@ public PyInt(uint value) : base(IntPtr.Zero)`
`84`	`78`	`public PyInt(long value) : base(IntPtr.Zero)`
`85`	`79`	`{`
`86`	`80`	`obj = Runtime.PyInt_FromInt64(value);`
`87`		`- if (obj == IntPtr.Zero)`
`88`		`- {`
`89`		`- throw new PythonException();`
`90`		`- }`
	`81`	`+ Runtime.CheckExceptionOccurred();`
`91`	`82`	`}`
`92`	`83`
`93`	`84`
`@@ -101,10 +92,7 @@ public PyInt(long value) : base(IntPtr.Zero)`
`101`	`92`	`public PyInt(ulong value) : base(IntPtr.Zero)`
`102`	`93`	`{`
`103`	`94`	`obj = Runtime.PyInt_FromInt64((long)value);`
`104`		`- if (obj == IntPtr.Zero)`
`105`		`- {`
`106`		`- throw new PythonException();`
`107`		`- }`
	`95`	`+ Runtime.CheckExceptionOccurred();`
`108`	`96`	`}`
`109`	`97`
`110`	`98`
`@@ -163,10 +151,7 @@ public PyInt(sbyte value) : this((int)value)`
`163`	`151`	`public PyInt(string value)`
`164`	`152`	`{`
`165`	`153`	`obj = Runtime.PyInt_FromString(value, IntPtr.Zero, 0);`
`166`		`- if (obj == IntPtr.Zero)`
`167`		`- {`
`168`		`- throw new PythonException();`
`169`		`- }`
	`154`	`+ Runtime.CheckExceptionOccurred();`
`170`	`155`	`}`
`171`	`156`
`172`	`157`
`@@ -193,10 +178,7 @@ public static bool IsIntType(PyObject value)`
`193`	`178`	`public static PyInt AsInt(PyObject value)`
`194`	`179`	`{`
`195`	`180`	`IntPtr op = Runtime.PyNumber_Int(value.obj);`
`196`		`- if (op == IntPtr.Zero)`
`197`		`- {`
`198`		`- throw new PythonException();`
`199`		`- }`
	`181`	`+ Runtime.CheckExceptionOccurred();`
`200`	`182`	`return new PyInt(op);`
`201`	`183`	`}`
`202`	`184`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,7 @@ public PyLong(PyObject o)`
`51`	`51`	`public PyLong(int value)`
`52`	`52`	`{`
`53`	`53`	`obj = Runtime.PyLong_FromLong(value);`
`54`		`- if (obj == IntPtr.Zero)`
`55`		`- {`
`56`		`- throw new PythonException();`
`57`		`- }`
	`54`	`+ Runtime.CheckExceptionOccurred();`
`58`	`55`	`}`
`59`	`56`
`60`	`57`
`@@ -68,10 +65,7 @@ public PyLong(int value)`
`68`	`65`	`public PyLong(uint value)`
`69`	`66`	`{`
`70`	`67`	`obj = Runtime.PyLong_FromLong(value);`
`71`		`- if (obj == IntPtr.Zero)`
`72`		`- {`
`73`		`- throw new PythonException();`
`74`		`- }`
	`68`	`+ Runtime.CheckExceptionOccurred();`
`75`	`69`	`}`
`76`	`70`
`77`	`71`
`@@ -84,10 +78,7 @@ public PyLong(uint value)`
`84`	`78`	`public PyLong(long value)`
`85`	`79`	`{`
`86`	`80`	`obj = Runtime.PyLong_FromLongLong(value);`
`87`		`- if (obj == IntPtr.Zero)`
`88`		`- {`
`89`		`- throw new PythonException();`
`90`		`- }`
	`81`	`+ Runtime.CheckExceptionOccurred();`
`91`	`82`	`}`
`92`	`83`
`93`	`84`
`@@ -101,10 +92,7 @@ public PyLong(long value)`
`101`	`92`	`public PyLong(ulong value)`
`102`	`93`	`{`
`103`	`94`	`obj = Runtime.PyLong_FromUnsignedLongLong(value);`
`104`		`- if (obj == IntPtr.Zero)`
`105`		`- {`
`106`		`- throw new PythonException();`
`107`		`- }`
	`95`	`+ Runtime.CheckExceptionOccurred();`
`108`	`96`	`}`
`109`	`97`
`110`	`98`
`@@ -117,10 +105,7 @@ public PyLong(ulong value)`
`117`	`105`	`public PyLong(short value)`
`118`	`106`	`{`
`119`	`107`	`obj = Runtime.PyLong_FromLong(value);`
`120`		`- if (obj == IntPtr.Zero)`
`121`		`- {`
`122`		`- throw new PythonException();`
`123`		`- }`
	`108`	`+ Runtime.CheckExceptionOccurred();`
`124`	`109`	`}`
`125`	`110`
`126`	`111`
`@@ -134,10 +119,7 @@ public PyLong(short value)`
`134`	`119`	`public PyLong(ushort value)`
`135`	`120`	`{`
`136`	`121`	`obj = Runtime.PyLong_FromLong(value);`
`137`		`- if (obj == IntPtr.Zero)`
`138`		`- {`
`139`		`- throw new PythonException();`
`140`		`- }`
	`122`	`+ Runtime.CheckExceptionOccurred();`
`141`	`123`	`}`
`142`	`124`
`143`	`125`
`@@ -150,10 +132,7 @@ public PyLong(ushort value)`
`150`	`132`	`public PyLong(byte value)`
`151`	`133`	`{`
`152`	`134`	`obj = Runtime.PyLong_FromLong(value);`
`153`		`- if (obj == IntPtr.Zero)`
`154`		`- {`
`155`		`- throw new PythonException();`
`156`		`- }`
	`135`	`+ Runtime.CheckExceptionOccurred();`
`157`	`136`	`}`
`158`	`137`
`159`	`138`
`@@ -167,10 +146,7 @@ public PyLong(byte value)`
`167`	`146`	`public PyLong(sbyte value)`
`168`	`147`	`{`
`169`	`148`	`obj = Runtime.PyLong_FromLong(value);`
`170`		`- if (obj == IntPtr.Zero)`
`171`		`- {`
`172`		`- throw new PythonException();`
`173`		`- }`
	`149`	`+ Runtime.CheckExceptionOccurred();`
`174`	`150`	`}`
`175`	`151`
`176`	`152`
`@@ -183,10 +159,7 @@ public PyLong(sbyte value)`
`183`	`159`	`public PyLong(double value)`
`184`	`160`	`{`
`185`	`161`	`obj = Runtime.PyLong_FromDouble(value);`
`186`		`- if (obj == IntPtr.Zero)`
`187`		`- {`
`188`		`- throw new PythonException();`
`189`		`- }`
	`162`	`+ Runtime.CheckExceptionOccurred();`
`190`	`163`	`}`
`191`	`164`
`192`	`165`
`@@ -199,10 +172,7 @@ public PyLong(double value)`
`199`	`172`	`public PyLong(string value)`
`200`	`173`	`{`
`201`	`174`	`obj = Runtime.PyLong_FromString(value, IntPtr.Zero, 0);`
`202`		`- if (obj == IntPtr.Zero)`
`203`		`- {`
`204`		`- throw new PythonException();`
`205`		`- }`
	`175`	`+ Runtime.CheckExceptionOccurred();`
`206`	`176`	`}`
`207`	`177`
`208`	`178`
`@@ -229,10 +199,7 @@ public static bool IsLongType(PyObject value)`
`229`	`199`	`public static PyLong AsLong(PyObject value)`
`230`	`200`	`{`
`231`	`201`	`IntPtr op = Runtime.PyNumber_Long(value.obj);`
`232`		`- if (op == IntPtr.Zero)`
`233`		`- {`
`234`		`- throw new PythonException();`
`235`		`- }`
	`202`	`+ Runtime.CheckExceptionOccurred();`
`236`	`203`	`return new PyLong(op);`
`237`	`204`	`}`
`238`	`205`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,7 @@ public PyString(PyObject o)`
`54`	`54`	`public PyString(string s)`
`55`	`55`	`{`
`56`	`56`	`obj = Runtime.PyUnicode_FromUnicode(s, s.Length);`
`57`		`- if (obj == IntPtr.Zero)`
`58`		`- {`
`59`		`- throw new PythonException();`
`60`		`- }`
	`57`	`+ Runtime.CheckExceptionOccurred();`
`61`	`58`	`}`
`62`	`59`
`63`	`60`