fixes

koubaa · koubaa · commit 059ab08d7bbd · 2021-02-16T12:50:42.000-06:00
diff --git a/src/runtime/CollectionWrappers/IterableWrapper.cs b/src/runtime/CollectionWrappers/IterableWrapper.cs
@@ -21,28 +21,21 @@ public IEnumerator<T> GetEnumerator()
         {
             PyObject iterObject = null;
             using (Py.GIL())
-            {
                 iterObject = new PyObject(Runtime.PyObject_GetIter(pyObject.Handle));
-            }
 
             while (true)
             {
-                IntPtr item = IntPtr.Zero;
                 using (Py.GIL())
                 {
-                    item = Runtime.PyIter_Next(iterObject.Handle);
-                }
-                if (item == IntPtr.Zero) break;
+                    var item = Runtime.PyIter_Next(iterObject.Handle);
+                    if (item == IntPtr.Zero)
+                    {
+                        iterObject.Dispose();
+                        break;
+                    }
 
-                object obj = null;
-                if (!Converter.ToManaged(item, typeof(T), out obj, true))
-                {
-                    Runtime.XDecref(item);
-                    Runtime.CheckExceptionOccurred();
+                    yield return (T)new PyObject(item).AsManagedObject(typeof(T));
                 }
-
-                Runtime.XDecref(item);
-                yield return (T)obj;
             }
         }
     }
diff --git a/src/runtime/converterextensions.cs b/src/runtime/converterextensions.cs
@@ -154,7 +154,7 @@ bool TryDecode(IntPtr pyHandle, out object result)
 
         #endregion
 
-        public static void Reset()
+        internal static void Reset()
         {
             lock (encoders)
                 lock (decoders)

Original file line number	Diff line number	Diff line change
`@@ -21,28 +21,21 @@ public IEnumerator<T> GetEnumerator()`
`21`	`21`	`{`
`22`	`22`	`PyObject iterObject = null;`
`23`	`23`	`using (Py.GIL())`
`24`		`- {`
`25`	`24`	`iterObject = new PyObject(Runtime.PyObject_GetIter(pyObject.Handle));`
`26`		`- }`
`27`	`25`
`28`	`26`	`while (true)`
`29`	`27`	`{`
`30`		`- IntPtr item = IntPtr.Zero;`
`31`	`28`	`using (Py.GIL())`
`32`	`29`	`{`
`33`		`- item = Runtime.PyIter_Next(iterObject.Handle);`
`34`		`- }`
`35`		`- if (item == IntPtr.Zero) break;`
	`30`	`+ var item = Runtime.PyIter_Next(iterObject.Handle);`
	`31`	`+ if (item == IntPtr.Zero)`
	`32`	`+ {`
	`33`	`+ iterObject.Dispose();`
	`34`	`+ break;`
	`35`	`+ }`
`36`	`36`
`37`		`- object obj = null;`
`38`		`- if (!Converter.ToManaged(item, typeof(T), out obj, true))`
`39`		`- {`
`40`		`- Runtime.XDecref(item);`
`41`		`- Runtime.CheckExceptionOccurred();`
	`37`	`+ yield return (T)new PyObject(item).AsManagedObject(typeof(T));`
`42`	`38`	`}`
`43`		`-`
`44`		`- Runtime.XDecref(item);`
`45`		`- yield return (T)obj;`
`46`	`39`	`}`
`47`	`40`	`}`
`48`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ bool TryDecode(IntPtr pyHandle, out object result)`
`154`	`154`
`155`	`155`	`#endregion`
`156`	`156`
`157`		`- public static void Reset()`
	`157`	`+ internal static void Reset()`
`158`	`158`	`{`
`159`	`159`	`lock (encoders)`
`160`	`160`	`lock (decoders)`