fixup! Add function of passing an arbitrary .NET object as the value of an attribute of PyObject by dynamic type

yagweb · yagweb · commit a7628ac429a7 · 2017-02-17T00:33:28.000+08:00
diff --git a/src/embed_tests/dynamic.cs b/src/embed_tests/dynamic.cs
@@ -8,73 +8,53 @@ namespace Python.EmbeddingTest
     [TestFixture]
     public class dynamicTest
     {
-        private IntPtr gs;
-        private outstream stream;
+        private Py.GILState gil;
 
         [SetUp]
         public void SetUp()
         {
-            PythonEngine.Initialize();
-            gs = PythonEngine.AcquireLock();
-
-            /* redirect sys.stdout to a .NET object */
-            stream = new outstream();
+            gil = Py.GIL();
         }
 
         [TearDown]
         public void TearDown()
         {
-            PythonEngine.ReleaseLock(gs);
-            PythonEngine.Shutdown();
+            gil.Dispose();
         }
-
-        /// <summary>
-        /// Set the attribute of a pyobject to null.
-        /// </summary>
-        [Test]
-        public void AssignNone()
-        {
-            dynamic sys = Py.Import("sys");
-            sys.stderr = null;
-            Assert.IsNull(sys.stderr);
-        }
-
+        
         /// <summary>
         /// Set the attribute of a pyobject with a .NET object.
         /// </summary>
         [Test]
         public void AssignObject()
         {
+            StringBuilder stream = new StringBuilder();
             dynamic sys = Py.Import("sys");
-            sys.stdout = stream;
+            sys.testattr = stream;
             // Check whether there are the same object.
-            Assert.AreEqual(sys.stdout, stream);
+            var _stream = sys.testattr.ToObject();
+            Assert.AreEqual(_stream, stream);
 
-            stream.clear();
-            PythonEngine.RunSimpleString("print('Hello!')");
-            Assert.AreEqual(stream.getvalue(), "Hello!\n");
+            PythonEngine.RunSimpleString(
+                "import sys\n" +
+                "sys.testattr.Append('Hello!')\n");
+            Assert.AreEqual(stream.ToString(), "Hello!");            
         }
 
         /// <summary>
-        /// When the .NET object was created and used in Python side.
+        /// Set the attribute of a pyobject to null.
         /// </summary>
-        /// <remarks>
-        /// Needs Pull Request #376 in order for the exception below to show up.
-        /// </remarks>
         [Test]
-        [Ignore("System.ArgumentException : Cannot pass a GCHandle across AppDomains")]
-        public void AssignObjectInPython()
+        public void AssignNone()
         {
-            PythonEngine.RunSimpleString(
-                "import sys\n" +
-                "from Python.EmbeddingTest import outstream\n" +
-                "sys.stdout = outstream()\n"
-            );
             dynamic sys = Py.Import("sys");
-            dynamic obj = sys.stdout;
-            Assert.IsTrue(obj is outstream);
-        }
+            sys.testattr = new StringBuilder();
+            Assert.IsNotNull(sys.testattr);
 
+            sys.testattr = null;
+            Assert.IsNull(sys.testattr);
+        }
+                
         /// <summary>
         /// Check whether we can get the attr of a python object when the value of attr is a PyObject.
         /// </summary>
@@ -83,8 +63,8 @@ public void AssignPyObject()
         {
             dynamic sys = Py.Import("sys");
             dynamic io = Py.Import("io");
-            sys.stderr = io.StringIO();
-            dynamic bb = sys.stderr; //Get the PyObject
+            sys.testattr = io.StringIO();
+            dynamic bb = sys.testattr; //Get the PyObject
             bb.write("Hello!");
             Assert.AreEqual(bb.getvalue().ToString(), "Hello!");
         }
@@ -95,26 +75,25 @@ public void AssignPyObject()
         [Test]
         public void PassObjectInPython()
         {
+            StringBuilder stream = new StringBuilder();
             dynamic sys = Py.Import("sys");
-            sys.stdout = stream;
+            sys.testattr1 = stream;
 
             //Pass the .NET object in Python side
             PythonEngine.RunSimpleString(
                 "import sys\n" +
-                "from io import StringIO\n" +
-                "sys.stderr = sys.stdout\n"
+                "sys.testattr2 = sys.testattr1\n"
             );
 
             //Compare in Python
-            stream.clear();
             PythonEngine.RunSimpleString(
                 "import sys\n" +
-                "print((sys.stderr is sys.stdout))\n"
+                "sys.testattr3 = sys.testattr1 is sys.testattr2\n"
             );
-            Assert.AreEqual(stream.getvalue(), "True\n");
+            Assert.AreEqual(sys.testattr3.ToString(), "True");
 
             //Compare in .NET
-            Assert.AreEqual(sys.stdout, sys.stderr);
+            Assert.AreEqual(sys.testattr1, sys.testattr2);
         }
 
         /// <summary>
@@ -123,55 +102,20 @@ public void PassObjectInPython()
         [Test]
         public void PassPyObjectInNet()
         {
+            StringBuilder stream = new StringBuilder();
             dynamic sys = Py.Import("sys");
-            sys.stdout = stream;
-            sys.stderr = sys.stdout;
+            sys.testattr1 = stream;
+            sys.testattr2 = sys.testattr1;
 
             //Compare in Python
             PyObject res = PythonEngine.RunString(
                 "import sys\n" +
-                "print(sys.stderr is sys.stdout)\n"
+                "sys.testattr3 = sys.testattr1 is sys.testattr2\n"
             );
-            Assert.AreEqual(sys.stdout.getvalue().ToString(), "False\n");
+            Assert.AreEqual(sys.testattr3.ToString(), "True");
 
             //Compare in .NET
-            Assert.AreEqual(sys.stdout, sys.stderr);
-        }
-    }
-
-    /// <summary>
-    /// Implement the interface of the sys.stdout redirection
-    /// </summary>
-    public class outstream
-    {
-        private StringBuilder buffer;
-
-        public outstream()
-        {
-            buffer = new StringBuilder();
-        }
-
-        public void write(string str)
-        {
-            buffer.Append(str);
-        }
-
-        public void flush()
-        {
-        }
-
-        public void close()
-        {
-        }
-
-        public void clear()
-        {
-            buffer.Clear();
-        }
-
-        public string getvalue()
-        {
-            return buffer.ToString();
+            Assert.AreEqual(sys.testattr1, sys.testattr2);
         }
     }
 }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -181,32 +181,7 @@ public bool HasAttr(PyObject name)
         {
             return Runtime.PyObject_HasAttr(obj, name.obj) != 0;
         }
-
-
-        /// <summary>
-        /// GetAttr Method For Dynamic Type
-        /// </summary>
-        /// <remarks>
-        /// Returns the named attribute of the Python object, or raises a
-        /// PythonException if the attribute access fails.
-        /// </remarks>
-        public object GetAttrDynamic(string name)
-        {
-            IntPtr op = Runtime.PyObject_GetAttrString(obj, name);
-            if (op == IntPtr.Zero)
-            {
-                throw new PythonException();
-            }
-            if (ManagedType.IsManagedType(op))
-            {
-                ManagedType managedMethod = ManagedType.GetManagedObject(op);
-                if (managedMethod is CLRObject)
-                {
-                    return ((CLRObject)managedMethod).inst;
-                }
-            }
-            return CheckNone(new PyObject(op));
-        }
+        
 
         /// <summary>
         /// GetAttr Method
@@ -299,27 +274,7 @@ public void SetAttr(string name, PyObject value)
                 throw new PythonException();
             }
         }
-
-        public void SetAttrDynamic(string name, object value)
-        {
-            if (value == null)
-            {
-                int r = Runtime.PyObject_SetAttrString(obj, name, Runtime.PyNone);
-                if (r < 0)
-                {
-                    throw new PythonException();
-                }
-            }
-            else if (value is PyObject)
-            {
-                this.SetAttr(name, (PyObject)value);
-            }
-            else
-            {
-                var ptr = Converter.ToPython(value, value.GetType());
-                this.SetAttr(name, new PyObject(ptr));
-            }
-        }
+        
 
         /// <summary>
         /// SetAttr Method
@@ -932,30 +887,49 @@ public override int GetHashCode()
             return Runtime.PyObject_Hash(obj).ToInt32();
         }
 
-        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        /// <summary>
+        /// ToObject Method
+        /// </summary>
+        /// <remarks>
+        /// If this PyObject is a wrapped .NET Object, then returns the .NET Object, or returns itself.
+        /// </remarks>
+        public virtual object ToObject()
         {
-            if (this.HasAttr(binder.Name))
+            if (ManagedType.IsManagedType(obj))
             {
-                result = this.GetAttrDynamic(binder.Name);
-                return true;
+                ManagedType managedMethod = ManagedType.GetManagedObject(obj);
+                if (managedMethod is CLRObject)
+                {
+                    return ((CLRObject)managedMethod).inst;
+                }
             }
-            else
+            return this;
+        }
+
+        public long Refcount
+        {
+            get
             {
-                return base.TryGetMember(binder, out result);
-            }
+                return Runtime.Refcount(obj);
+            }            
+        }
+
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            result = CheckNone(this.GetAttr(binder.Name));
+            return true;
         }
 
         public override bool TrySetMember(SetMemberBinder binder, object value)
         {
-            if (this.HasAttr(binder.Name))
-            {
-                this.SetAttrDynamic(binder.Name, value);
-                return true;
-            }
-            else
+            IntPtr ptr = Converter.ToPython(value, value?.GetType());
+            int r = Runtime.PyObject_SetAttrString(obj, binder.Name, ptr);
+            if (r < 0)
             {
-                return base.TrySetMember(binder, value);
+                throw new PythonException();
             }
+            Runtime.XDecref(ptr);
+            return true;
         }
 
         private void GetArgs(object[] inargs, out PyTuple args, out PyDict kwargs)
