Merge

dse · dse · commit 6488c2a4fc3a · 2018-01-13T15:45:23.000+04:00
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
           sources:
           - sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
             key_url: https://packages.microsoft.com/keys/microsoft.asc
-          - sourceline: deb http://download.mono-project.com/repo/debian trusty/snapshots/5.2.0.224 main
+          - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
             key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
           packages:
             - mono-devel
@@ -77,7 +77,7 @@ env:
 addons:
   apt:
     sources:
-      - sourceline: deb http://download.mono-project.com/repo/debian trusty/snapshots/5.2.0.224 main
+      - sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
         key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
     packages:
       - mono-devel
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
@@ -15,7 +15,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;

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
`@@ -15,7 +15,7 @@ namespace Python.Runtime`
`15`	`15`	`/// PY3: https://docs.python.org/3/c-api/object.html`
`16`	`16`	`/// for details.`
`17`	`17`	`/// </summary>`
`18`		`- public class PyObject : DynamicObject, IDisposable`
	`18`	`+ public class PyObject : DynamicObject, IEnumerable, IDisposable`
`19`	`19`	`{`
`20`	`20`	`protected internal IntPtr obj = IntPtr.Zero;`
`21`	`21`	`private bool disposed = false;`