Merge branch 'master' into implicit_assembly_load_opt

den-run-ai · web-flow · commit c28bafdba989 · 2018-02-09T23:53:17.000-06:00
diff --git a/src/embed_tests/TestExample.cs b/src/embed_tests/TestExample.cs
@@ -47,7 +47,7 @@ public void TestReadme()
             dynamic b = np.array(new List<float> { 6, 5, 4 }, Py.kw("dtype", np.int32));
             Assert.AreEqual("int32", b.dtype.ToString());
 
-            Assert.AreEqual("[  6.  10.  12.]", (a * b).ToString());
+            Assert.AreEqual("[ 6. 10. 12.]", (a * b).ToString().Replace("  ", " "));
         }
     }
 }
diff --git a/src/embed_tests/TestPythonException.cs b/src/embed_tests/TestPythonException.cs
@@ -40,5 +40,19 @@ public void TestNoError()
             var e = new PythonException(); // There is no PyErr to fetch
             Assert.AreEqual("", e.Message);
         }
+
+        [Test]
+        public void TestPythonErrorTypeName()
+        {
+            try
+            {
+                var module = PythonEngine.ImportModule("really____unknown___module");
+                Assert.Fail("Unknown module should not be loaded");
+            }
+            catch (PythonException ex)
+            {
+                Assert.That(ex.PythonTypeName, Is.EqualTo("ModuleNotFoundError").Or.EqualTo("ImportError"));
+            }
+        }
     }
 }
diff --git a/src/embed_tests/dynamic.cs b/src/embed_tests/dynamic.cs
@@ -103,7 +103,7 @@ public void PassObjectInPython()
             Assert.AreEqual(sys.testattr3.ToString(), "True");
 
             // Compare in .NET
-            Assert.AreEqual(sys.testattr1, sys.testattr2);
+            Assert.IsTrue(sys.testattr1.Equals(sys.testattr2));
         }
 
         /// <summary>
@@ -125,7 +125,7 @@ public void PassPyObjectInNet()
             Assert.AreEqual(sys.testattr3.ToString(), "True");
 
             // Compare in .NET
-            Assert.AreEqual(sys.testattr1, sys.testattr2);
+            Assert.IsTrue(sys.testattr1.Equals(sys.testattr2));
         }
     }
 }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -12,7 +12,7 @@ namespace Python.Runtime
     /// PY3: https://docs.python.org/3/c-api/object.html
     /// for details.
     /// </summary>
-    public class PyObject : DynamicObject, IDisposable
+    public class PyObject : DynamicObject, IEnumerable, IDisposable
     {
         protected internal IntPtr obj = IntPtr.Zero;
         private bool disposed = false;
diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
@@ -13,6 +13,7 @@ public class PythonException : System.Exception
         private IntPtr _pyTB = IntPtr.Zero;
         private string _tb = "";
         private string _message = "";
+        private string _pythonTypeName = "";
         private bool disposed = false;
 
         public PythonException()
@@ -33,6 +34,8 @@ public PythonException()
                     type = pyTypeName.ToString();
                 }
 
+                _pythonTypeName = type;
+
                 Runtime.XIncref(_pyValue);
                 using (var pyValue = new PyObject(_pyValue))
                 {
@@ -132,6 +135,13 @@ public override string StackTrace
             get { return _tb; }
         }
 
+        /// <summary>
+        /// Python error type name.
+        /// </summary>
+        public string PythonTypeName
+        {
+            get { return _pythonTypeName; }
+        }
 
         /// <summary>
         /// Dispose Method

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void TestReadme()`
`47`	`47`	`dynamic b = np.array(new List<float> { 6, 5, 4 }, Py.kw("dtype", np.int32));`
`48`	`48`	`Assert.AreEqual("int32", b.dtype.ToString());`
`49`	`49`
`50`		`- Assert.AreEqual("[ 6. 10. 12.]", (a * b).ToString());`
	`50`	`+ Assert.AreEqual("[ 6. 10. 12.]", (a * b).ToString().Replace(" ", " "));`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public void PassObjectInPython()`
`103`	`103`	`Assert.AreEqual(sys.testattr3.ToString(), "True");`
`104`	`104`
`105`	`105`	`// Compare in .NET`
`106`		`- Assert.AreEqual(sys.testattr1, sys.testattr2);`
	`106`	`+ Assert.IsTrue(sys.testattr1.Equals(sys.testattr2));`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/// <summary>`
`@@ -125,7 +125,7 @@ public void PassPyObjectInNet()`
`125`	`125`	`Assert.AreEqual(sys.testattr3.ToString(), "True");`
`126`	`126`
`127`	`127`	`// Compare in .NET`
`128`		`- Assert.AreEqual(sys.testattr1, sys.testattr2);`
	`128`	`+ Assert.IsTrue(sys.testattr1.Equals(sys.testattr2));`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Python.Runtime`
`12`	`12`	`/// PY3: https://docs.python.org/3/c-api/object.html`
`13`	`13`	`/// for details.`
`14`	`14`	`/// </summary>`
`15`		`- public class PyObject : DynamicObject, IDisposable`
	`15`	`+ public class PyObject : DynamicObject, IEnumerable, IDisposable`
`16`	`16`	`{`
`17`	`17`	`protected internal IntPtr obj = IntPtr.Zero;`
`18`	`18`	`private bool disposed = false;`