Fix a few more temporary objects to be disposed cleanly.

unknown · unknown · commit 8f8aff9074bc · 2015-01-28T14:05:47.000Z
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -108,24 +108,27 @@ public static IntPtr GetCLRModule(IntPtr? fromList=null) {
                 if (Runtime.PyTuple_Check(fromList.GetValueOrDefault()))
                 {
                     Runtime.Incref(py_mod_dict);
-                    PyDict mod_dict = new PyDict(py_mod_dict);
-
-                    Runtime.Incref(fromList.GetValueOrDefault());
-                    PyTuple from = new PyTuple(fromList.GetValueOrDefault());
-                    foreach (PyObject item in from) {
-                        if (mod_dict.HasKey(item))
-                            continue;
-
-                        string s = item.AsManagedObject(typeof(string)) as string;
-                        if (null == s)
-                            continue;
-
-                        ManagedType attr = root.GetAttribute(s, true);
-                        if (null == attr)
-                            continue;
-
-                        Runtime.Incref(attr.pyHandle);
-                        mod_dict.SetItem(s, new PyObject(attr.pyHandle));
+                    using(PyDict mod_dict = new PyDict(py_mod_dict)) {
+                        Runtime.Incref(fromList.GetValueOrDefault());
+                        using (PyTuple from = new PyTuple(fromList.GetValueOrDefault())) {
+                            foreach (PyObject item in from) {
+                                if (mod_dict.HasKey(item))
+                                    continue;
+
+                                string s = item.AsManagedObject(typeof(string)) as string;
+                                if (null == s)
+                                    continue;
+
+                                ManagedType attr = root.GetAttribute(s, true);
+                                if (null == attr)
+                                    continue;
+
+                                Runtime.Incref(attr.pyHandle);
+                                using (PyObject obj = new PyObject(attr.pyHandle)) {
+                                    mod_dict.SetItem(s, obj);
+                                }
+                            }
+                        }
                     }
                 }
             }
diff --git a/src/runtime/pydict.cs b/src/runtime/pydict.cs
@@ -102,7 +102,8 @@ public bool HasKey(PyObject key) {
         /// </remarks>
 
         public bool HasKey(string key) {
-            return HasKey(new PyString(key));
+            using (PyString str = new PyString(key))
+                return HasKey(str);
         }
 
 
diff --git a/src/runtime/pyfloat.cs b/src/runtime/pyfloat.cs
@@ -76,10 +76,11 @@ public PyFloat(double value) : base() {
         /// </remarks>
 
         public PyFloat(string value) : base() {
-            PyString s = new PyString(value);
-            obj = Runtime.PyFloat_FromString(s.obj, IntPtr.Zero);
-            if (obj == IntPtr.Zero) {
-                throw new PythonException();
+            using (PyString s = new PyString(value)) {
+                obj = Runtime.PyFloat_FromString(s.obj, IntPtr.Zero);
+                if (obj == IntPtr.Zero) {
+                    throw new PythonException();
+                }
             }
         }
 
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -364,7 +364,8 @@ public virtual PyObject GetItem(PyObject key) {
     /// </remarks>
 
     public virtual PyObject GetItem(string key) {
-        return GetItem(new PyString(key));
+        using (PyString pyKey = new PyString(key))
+            return GetItem(pyKey);
     }
 
 
@@ -413,7 +414,8 @@ public virtual void SetItem(PyObject key, PyObject value) {
     /// </remarks>
 
     public virtual void SetItem(string key, PyObject value) {
-        SetItem(new PyString(key), value);
+        using (PyString pyKey = new PyString(key))
+            SetItem(pyKey, value);
     }
 
 
@@ -461,7 +463,8 @@ public virtual void DelItem(PyObject key) {
     /// </remarks>
 
     public virtual void DelItem(string key) {
-        DelItem(new PyString(key));
+        using (PyString pyKey = new PyString(key))
+            DelItem(pyKey);
     }
 
 
diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
@@ -34,14 +34,19 @@ public PythonException() : base()
         Runtime.Incref(_pyTB);
         if ((_pyType != IntPtr.Zero) && (_pyValue != IntPtr.Zero))
         {
-            string type = new PyObject(_pyType).GetAttr("__name__").ToString();
+            string type;
+            using (PyObject pyType = new PyObject(_pyType)) {
+                type = pyType.GetAttr("__name__").ToString();
+            }
             string message = Runtime.GetManagedString(_pyValue);
             _message = type + " : " + message;
         }
         if (_pyTB != IntPtr.Zero)
         {
             PyObject tb_module = PythonEngine.ImportModule("traceback");
-            _tb = tb_module.InvokeMethod("format_tb", new PyObject(_pyTB)).ToString();
+            using (PyObject pyTB = new PyObject(_pyTB)) {
+                _tb = tb_module.InvokeMethod("format_tb", pyTB).ToString();
+            }
         }
         PythonEngine.ReleaseLock(gs);
     }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ public bool HasKey(PyObject key) {`
`102`	`102`	`/// </remarks>`
`103`	`103`
`104`	`104`	`public bool HasKey(string key) {`
`105`		`- return HasKey(new PyString(key));`
	`105`	`+ using (PyString str = new PyString(key))`
	`106`	`+ return HasKey(str);`
`106`	`107`	`}`
`107`	`108`
`108`	`109`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,11 @@ public PyFloat(double value) : base() {`
`76`	`76`	`/// </remarks>`
`77`	`77`
`78`	`78`	`public PyFloat(string value) : base() {`
`79`		`- PyString s = new PyString(value);`
`80`		`- obj = Runtime.PyFloat_FromString(s.obj, IntPtr.Zero);`
`81`		`- if (obj == IntPtr.Zero) {`
`82`		`- throw new PythonException();`
	`79`	`+ using (PyString s = new PyString(value)) {`
	`80`	`+ obj = Runtime.PyFloat_FromString(s.obj, IntPtr.Zero);`
	`81`	`+ if (obj == IntPtr.Zero) {`
	`82`	`+ throw new PythonException();`
	`83`	`+ }`
`83`	`84`	`}`
`84`	`85`	`}`
`85`	`86`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,8 @@ public virtual PyObject GetItem(PyObject key) {`
`364`	`364`	`/// </remarks>`
`365`	`365`
`366`	`366`	`public virtual PyObject GetItem(string key) {`
`367`		`- return GetItem(new PyString(key));`
	`367`	`+ using (PyString pyKey = new PyString(key))`
	`368`	`+ return GetItem(pyKey);`
`368`	`369`	`}`
`369`	`370`
`370`	`371`
`@@ -413,7 +414,8 @@ public virtual void SetItem(PyObject key, PyObject value) {`
`413`	`414`	`/// </remarks>`
`414`	`415`
`415`	`416`	`public virtual void SetItem(string key, PyObject value) {`
`416`		`- SetItem(new PyString(key), value);`
	`417`	`+ using (PyString pyKey = new PyString(key))`
	`418`	`+ SetItem(pyKey, value);`
`417`	`419`	`}`
`418`	`420`
`419`	`421`
`@@ -461,7 +463,8 @@ public virtual void DelItem(PyObject key) {`
`461`	`463`	`/// </remarks>`
`462`	`464`
`463`	`465`	`public virtual void DelItem(string key) {`
`464`		`- DelItem(new PyString(key));`
	`466`	`+ using (PyString pyKey = new PyString(key))`
	`467`	`+ DelItem(pyKey);`
`465`	`468`	`}`
`466`	`469`
`467`	`470`
Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,19 @@ public PythonException() : base()`
`34`	`34`	`Runtime.Incref(_pyTB);`
`35`	`35`	`if ((_pyType != IntPtr.Zero) && (_pyValue != IntPtr.Zero))`
`36`	`36`	`{`
`37`		`- string type = new PyObject(_pyType).GetAttr("__name__").ToString();`
	`37`	`+ string type;`
	`38`	`+ using (PyObject pyType = new PyObject(_pyType)) {`
	`39`	`+ type = pyType.GetAttr("__name__").ToString();`
	`40`	`+ }`
`38`	`41`	`string message = Runtime.GetManagedString(_pyValue);`
`39`	`42`	`_message = type + " : " + message;`
`40`	`43`	`}`
`41`	`44`	`if (_pyTB != IntPtr.Zero)`
`42`	`45`	`{`
`43`	`46`	`PyObject tb_module = PythonEngine.ImportModule("traceback");`
`44`		`- _tb = tb_module.InvokeMethod("format_tb", new PyObject(_pyTB)).ToString();`
	`47`	`+ using (PyObject pyTB = new PyObject(_pyTB)) {`
	`48`	`+ _tb = tb_module.InvokeMethod("format_tb", pyTB).ToString();`
	`49`	`+ }`
`45`	`50`	`}`
`46`	`51`	`PythonEngine.ReleaseLock(gs);`
`47`	`52`	`}`