Add function of passing an arbitrary .NET object as the value of an

yagweb · yagweb · commit eec8893f7c96 · 2017-02-10T14:10:48.000+08:00
attribute of PyObject by dynamic type
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -39,3 +39,4 @@
 -   ([@rico-chet](https://github.com/rico-chet))
 -   ([@rmadsen-ks](https://github.com/rmadsen-ks))
 -   ([@stonebig](https://github.com/stonebig))
+-   Wenguang Yang ([@yagweb](https://github.com/yagweb))
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Added XML Documentation (#349)
 -   Added Embedded tests on Appveyor (#353)
 -   Added PY3 settings to configuration-manager (#346)
+-   Added function of passing an arbitrary .NET object as the value of an attribute of PyObject (#370)
 
 ### Changed
 
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -181,7 +181,31 @@ 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
@@ -891,7 +915,7 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
         {
             if (this.HasAttr(binder.Name))
             {
-                result = CheckNone(this.GetAttr(binder.Name));
+                result = this.GetAttrDynamic(binder.Name);
                 return true;
             }
             else
@@ -904,7 +928,15 @@ public override bool TrySetMember(SetMemberBinder binder, object value)
         {
             if (this.HasAttr(binder.Name))
             {
-                this.SetAttr(binder.Name, (PyObject)value);
+                if (value is PyObject)
+                {
+                    this.SetAttr(binder.Name, (PyObject)value);
+                }
+                else
+                {
+                    var ptr = CLRObject.GetInstHandle(value, value.GetType());
+                    this.SetAttr(binder.Name, new PyObject(ptr));
+                }
                 return true;
             }
             else
