Merge branch 'master' into master

filmor · web-flow · commit 112681976762 · 2018-05-28T11:52:26.000+02:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -14,6 +14,7 @@
 
 -   Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
 -   Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))
+-   Callum Noble ([@callumnoble](https://github.com/callumnoble))
 -   Christian Heimes ([@tiran](https://github.com/tiran))
 -   Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))
 -   Christopher Pow ([@christopherpow](https://github.com/christopherpow))
@@ -47,4 +48,5 @@
 -   ([@rmadsen-ks](https://github.com/rmadsen-ks))
 -   ([@stonebig](https://github.com/stonebig))
 -   ([@testrunner123](https://github.com/testrunner123))
+-   ([@GSPP](https://github.com/GSPP))
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Fixed 'clrmethod' for python 2 (#492)
 -   Fixed double calling of constructor when deriving from .NET class (#495)
 -   Fixed `clr.GetClrType` when iterating over `System` members (#607) 
+-   Fixed `LockRecursionException` when loading assemblies (#627)
+-   Fixed errors breaking .NET Remoting on method invoke (#276)
+-   Fixed PyObject.GetHashCode (#676)
 
 
 ## [2.3.0][] - 2017-03-11
diff --git a/appveyor.yml b/appveyor.yml
@@ -41,6 +41,7 @@ init:
   - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
 
 install:
+  - python -m pip install -U pip
   - pip install --upgrade -r requirements.txt --quiet
 
   # Install OpenCover. Can't put on `packages.config`, not Mono compatible
diff --git a/requirements.txt b/requirements.txt
@@ -6,6 +6,6 @@ coverage
 codecov
 
 # Platform specific requirements
-pip; sys_platform == 'win32'
+# pip; sys_platform == 'win32'
 wheel; sys_platform == 'win32'
 pycparser; sys_platform != 'win32'
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -26,7 +26,7 @@ internal class AssemblyManager
         private static Dictionary<string, int> probed;
 
         // modified from event handlers below, potentially triggered from different .NET threads
-        private static AssemblyList assemblies;
+        private static ConcurrentQueue<Assembly> assemblies;
         internal static List<string> pypath;
 
         private AssemblyManager()
@@ -43,7 +43,7 @@ internal static void Initialize()
             namespaces = new ConcurrentDictionary<string, ConcurrentDictionary<Assembly, string>>();
             probed = new Dictionary<string, int>(32);
             //generics = new Dictionary<string, Dictionary<string, string>>();
-            assemblies = new AssemblyList(16);
+            assemblies = new ConcurrentQueue<Assembly>();
             pypath = new List<string>(16);
 
             AppDomain domain = AppDomain.CurrentDomain;
@@ -60,7 +60,7 @@ internal static void Initialize()
                 try
                 {
                     ScanAssembly(a);
-                    assemblies.Add(a);
+                    assemblies.Enqueue(a);
                 }
                 catch (Exception ex)
                 {
@@ -91,7 +91,7 @@ internal static void Shutdown()
         private static void AssemblyLoadHandler(object ob, AssemblyLoadEventArgs args)
         {
             Assembly assembly = args.LoadedAssembly;
-            assemblies.Add(assembly);
+            assemblies.Enqueue(assembly);
             ScanAssembly(assembly);
         }
 
@@ -461,103 +461,5 @@ public static Type LookupType(string qname)
             }
             return null;
         }
-
-        /// <summary>
-        /// Wrapper around List&lt;Assembly&gt; for thread safe access
-        /// </summary>
-        private class AssemblyList : IEnumerable<Assembly>
-        {
-            private readonly List<Assembly> _list;
-            private readonly ReaderWriterLockSlim _lock;
-
-            public AssemblyList(int capacity)
-            {
-                _list = new List<Assembly>(capacity);
-                _lock = new ReaderWriterLockSlim();
-            }
-
-            public int Count
-            {
-                get
-                {
-                    _lock.EnterReadLock();
-                    try
-                    {
-                        return _list.Count;
-                    }
-                    finally
-                    {
-                        _lock.ExitReadLock();
-                    }
-                }
-            }
-
-            public void Add(Assembly assembly)
-            {
-                _lock.EnterWriteLock();
-                try
-                {
-                    _list.Add(assembly);
-                }
-                finally
-                {
-                    _lock.ExitWriteLock();
-                }
-            }
-
-            public IEnumerator GetEnumerator()
-            {
-                return ((IEnumerable<Assembly>)this).GetEnumerator();
-            }
-
-            /// <summary>
-            /// Enumerator wrapping around <see cref="AssemblyList._list" />'s enumerator.
-            /// Acquires and releases a read lock on <see cref="AssemblyList._lock" /> during enumeration
-            /// </summary>
-            private class Enumerator : IEnumerator<Assembly>
-            {
-                private readonly AssemblyList _assemblyList;
-
-                private readonly IEnumerator<Assembly> _listEnumerator;
-
-                public Enumerator(AssemblyList assemblyList)
-                {
-                    _assemblyList = assemblyList;
-                    _assemblyList._lock.EnterReadLock();
-                    _listEnumerator = _assemblyList._list.GetEnumerator();
-                }
-
-                public void Dispose()
-                {
-                    _listEnumerator.Dispose();
-                    _assemblyList._lock.ExitReadLock();
-                }
-
-                public bool MoveNext()
-                {
-                    return _listEnumerator.MoveNext();
-                }
-
-                public void Reset()
-                {
-                    _listEnumerator.Reset();
-                }
-
-                public Assembly Current
-                {
-                    get { return _listEnumerator.Current; }
-                }
-
-                object IEnumerator.Current
-                {
-                    get { return Current; }
-                }
-            }
-
-            IEnumerator<Assembly> IEnumerable<Assembly>.GetEnumerator()
-            {
-                return new Enumerator(this);
-            }
-        }
     }
 }
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -155,7 +155,15 @@ internal static IntPtr ToPython(object value, Type type)
             var pyderived = value as IPythonDerivedType;
             if (null != pyderived)
             {
+                #if NETSTANDARD
                 return ClassDerivedObject.ToPython(pyderived);
+                #else
+                // if object is remote don't do this
+                if (!System.Runtime.Remoting.RemotingServices.IsTransparentProxy(pyderived))
+                {
+                    return ClassDerivedObject.ToPython(pyderived);
+                }
+                #endif
             }
 
             // hmm - from Python, we almost never care what the declared
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -909,7 +909,7 @@ public override bool Equals(object o)
         /// </remarks>
         public override int GetHashCode()
         {
-            return Runtime.PyObject_Hash(obj).ToInt32();
+            return ((ulong)Runtime.PyObject_Hash(obj)).GetHashCode();
         }
 
 
diff --git a/src/tests/test_module.py b/src/tests/test_module.py
@@ -387,3 +387,9 @@ def test_assembly_load_thread_safety():
         from System.Collections.Generic import Dictionary
         _ = Dictionary[Guid, DateTime]()
     ModuleTest.JoinThreads()
+
+def test_assembly_load_recursion_bug():
+    """Test fix for recursion bug documented in #627"""
+    from System.Configuration import ConfigurationManager
+    content = dir(ConfigurationManager)
+    assert len(content) > 5, content

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@ public override bool Equals(object o)`
`909`	`909`	`/// </remarks>`
`910`	`910`	`public override int GetHashCode()`
`911`	`911`	`{`
`912`		`- return Runtime.PyObject_Hash(obj).ToInt32();`
	`912`	`+ return ((ulong)Runtime.PyObject_Hash(obj)).GetHashCode();`
`913`	`913`	`}`
`914`	`914`
`915`	`915`