Fixed comment and removed \r from added source

pythonnet · den-run-ai · Dec 16, 2016 · Nov 29, 2016 · Nov 30, 2016 · Nov 30, 2016
commit 335cd37c54a2837e677ed8e1a671300b2231ce2b
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -126,11 +126,11 @@ internal static IntPtr ToPython<T>(T value)
 
         internal static IntPtr ToPython(Object value, Type type)
         {
-            if(value is PyObject)
-            {
-                IntPtr handle = ((PyObject)value).Handle;
-                Runtime.XIncref(handle);
-                return handle;
+            if(value is PyObject)
+            {
+                IntPtr handle = ((PyObject)value).Handle;
+                Runtime.XIncref(handle);
+                return handle;
             }
             IntPtr result = IntPtr.Zero;
 
@@ -271,15 +271,15 @@ internal static bool ToManaged(IntPtr value, Type type,
         internal static bool ToManagedValue(IntPtr value, Type obType,
             out Object result, bool setError)
         {
-            if (obType == typeof(PyObject))
-            {
-                Runtime.XIncref(value); // PyObject() assumes ownership
-                result = new PyObject(value);
-                return true;
-            }
-
-            // Common case: if the Python value is a wrapped managed object
-            // instance, just return the wrapped object.
+            if (obType == typeof(PyObject))
+            {
+                Runtime.XIncref(value); // PyObject() assumes ownership
+                result = new PyObject(value);
+                return true;
+            }
+
+            // Common case: if the Python value is a wrapped managed object
+            // instance, just return the wrapped object.
             ManagedType mt = ManagedType.GetManagedObject(value);
             result = null;
 

diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -127,6 +127,16 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
+        public long RefCount
+        {
+            get
+            {
+                if(!disposed)
+                    return Runtime.Refcount(obj);
+                return -1;
+            }
+        }
+
         public void Dispose()
         {
             Dispose(true);

diff --git a/src/testing/callbacktest.cs b/src/testing/callbacktest.cs
@@ -27,19 +27,19 @@ public string Call_simpleDefaultArg_WithEmptyArgs(string moduleName)
                 return module.simpleDefaultArg();
             }
         }
-    }
-
-    //==========================================================================
-    // Tests calling from Python into C# and back into Python using a PyObject.
-    // SelfCallbackTest should be inherited from a Python class. 
-    // Used in test_class.py / testCallback
-    //==========================================================================
-    public class SelfCallbackTest
-    {
-        public void Callback(Runtime.PyObject self)
-        {
-            using (Runtime.Py.GIL())
-                ((dynamic)self).PyCallback(self);
-        }
+    }
+
+    //==========================================================================
+    // Tests calling from Python into C# and back into Python using a PyObject.
+    // SelfCallbackTest should be inherited by a Python class. 
+    // Used in test_class.py / testCallback
+    //==========================================================================
+    public class SelfCallbackTest
+    {
+        public void Callback(Runtime.PyObject self)
+        {
+            using (Runtime.Py.GIL())
+                ((dynamic)self).PyCallback(self);
+        }
     }
 }