Merge pull request #1 from pythonnet/master

tomunger · web-flow · commit 04c1096997bc · 2018-06-12T10:18:26.000-07:00
Update to pythonnet
diff --git a/.travis.yml b/.travis.yml
@@ -22,10 +22,6 @@ matrix:
             - dotnet-hostfxr-2.0.0
             - dotnet-runtime-2.0.0
             - dotnet-sdk-2.0.0
-    - python: 3.3
-      env: *xplat-env
-      addons: *xplat-addons
-
     - python: 3.4
       env: *xplat-env
       addons: *xplat-addons
@@ -47,9 +43,6 @@ matrix:
         - BUILD_OPTS=
         - NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
 
-    - python: 3.3
-      env: *classic-env
-
     - python: 3.4
       env: *classic-env
 
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -48,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
@@ -31,6 +31,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   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
@@ -17,16 +17,13 @@ environment:
   matrix:
     - PYTHON_VERSION: 2.7 
       BUILD_OPTS: --xplat
-    - PYTHON_VERSION: 3.3
-      BUILD_OPTS: --xplat
     - PYTHON_VERSION: 3.4
       BUILD_OPTS: --xplat
     - PYTHON_VERSION: 3.5
       BUILD_OPTS: --xplat
     - PYTHON_VERSION: 3.6
       BUILD_OPTS: --xplat
     - PYTHON_VERSION: 2.7
-    - PYTHON_VERSION: 3.3
     - PYTHON_VERSION: 3.4
     - PYTHON_VERSION: 3.5
     - PYTHON_VERSION: 3.6
@@ -41,6 +38,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/interop33.cs b/src/runtime/interop33.cs
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -395,6 +395,14 @@ public static Assembly AddReference(string name)
             {
                 assembly = AssemblyManager.LoadAssemblyFullPath(name);
             }
+            if (System.IO.File.Exists(name))
+            {
+                var zone = System.Security.Policy.Zone.CreateFromUrl(name);
+                if (zone.SecurityZone != System.Security.SecurityZone.MyComputer)
+                {
+                     throw new Exception($"File is blocked (NTFS Security)");
+                }
+            }
             if (assembly == null)
             {
                 throw new FileNotFoundException($"Unable to find assembly '{name}'.");
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/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -139,9 +139,6 @@ public class Runtime
 #if PYTHON27
         internal const string _pyversion = "2.7";
         internal const string _pyver = "27";
-#elif PYTHON33
-        internal const string _pyversion = "3.3";
-        internal const string _pyver = "33";
 #elif PYTHON34
         internal const string _pyversion = "3.4";
         internal const string _pyver = "34";
@@ -155,7 +152,7 @@ public class Runtime
         internal const string _pyversion = "3.7";
         internal const string _pyver = "37";
 #else
-#error You must define one of PYTHON33 to PYTHON37 or PYTHON27
+#error You must define one of PYTHON34 to PYTHON37 or PYTHON27
 #endif
 
 #if MONO_LINUX || MONO_OSX // Linux/macOS use dotted version string

Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,14 @@ public static Assembly AddReference(string name)`
`395`	`395`	`{`
`396`	`396`	`assembly = AssemblyManager.LoadAssemblyFullPath(name);`
`397`	`397`	`}`
	`398`	`+ if (System.IO.File.Exists(name))`
	`399`	`+ {`
	`400`	`+ var zone = System.Security.Policy.Zone.CreateFromUrl(name);`
	`401`	`+ if (zone.SecurityZone != System.Security.SecurityZone.MyComputer)`
	`402`	`+ {`
	`403`	`+ throw new Exception($"File is blocked (NTFS Security)");`
	`404`	`+ }`
	`405`	`+ }`
`398`	`406`	`if (assembly == null)`
`399`	`407`	`{`
`400`	`408`	`throw new FileNotFoundException($"Unable to find assembly '{name}'.");`
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`