Fix issues

koubaa · koubaa · commit 8d74e1c34882 · 2020-09-19T21:05:30.000-05:00
diff --git a/src/runtime/pyiter.cs b/src/runtime/pyiter.cs
@@ -25,21 +25,6 @@ public PyIter(IntPtr ptr) : base(ptr)
         {
         }
 
-        private static IntPtr FromObject(PyObject iterable)
-        {
-            if (iterable == null)
-            {
-                throw new NullReferenceException();
-            }
-            IntPtr val = Runtime.PyObject_GetIter(iterable.obj);
-            if (val == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
-            return val;
-        }
-
-
         /// <summary>
         /// PyIter factory function.
         /// </summary>
@@ -52,13 +37,10 @@ public static PyIter GetIter(PyObject iterable)
         {
             if (iterable == null)
             {
-                throw new NullReferenceException();
+                throw new ArgumentNullException();
             }
             IntPtr val = Runtime.PyObject_GetIter(iterable.obj);
-            if (val == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
+            PythonException.ThrowIfIsNull(val);
             return new PyIter(val);
         }
 
diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
@@ -261,10 +261,11 @@ internal static void ThrowIfIsNull(BorrowedReference reference)
             }
         }
 
-        public static void ThrowIfIsNotZero(int value)
+        public static void ThrowIfIsNotZero(int value, Action onBeforeThrow = null)
         {
             if (value != 0)
             {
+                onBeforeThrow?.Invoke();
                 throw new PythonException();
             }
         }
diff --git a/src/runtime/pytuple.cs b/src/runtime/pytuple.cs
@@ -74,7 +74,7 @@ private static IntPtr FromArray(PyObject[] items)
                 IntPtr ptr = items[i].obj;
                 Runtime.XIncref(ptr);
                 int res = Runtime.PyTuple_SetItem(val, i, ptr);
-                PythonException.ThrowIfIsNotZero(res);
+                PythonException.ThrowIfIsNotZero(res, () => Runtime.Py_DecRef(val));
             }
             return val;
         }

Original file line number	Diff line number	Diff line change
`@@ -261,10 +261,11 @@ internal static void ThrowIfIsNull(BorrowedReference reference)`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`
`264`		`- public static void ThrowIfIsNotZero(int value)`
	`264`	`+ public static void ThrowIfIsNotZero(int value, Action onBeforeThrow = null)`
`265`	`265`	`{`
`266`	`266`	`if (value != 0)`
`267`	`267`	`{`
	`268`	`+ onBeforeThrow?.Invoke();`
`268`	`269`	`throw new PythonException();`
`269`	`270`	`}`
`270`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ private static IntPtr FromArray(PyObject[] items)`
`74`	`74`	`IntPtr ptr = items[i].obj;`
`75`	`75`	`Runtime.XIncref(ptr);`
`76`	`76`	`int res = Runtime.PyTuple_SetItem(val, i, ptr);`
`77`		`- PythonException.ThrowIfIsNotZero(res);`
	`77`	`+ PythonException.ThrowIfIsNotZero(res, () => Runtime.Py_DecRef(val));`
`78`	`78`	`}`
`79`	`79`	`return val;`
`80`	`80`	`}`