Merge branch 'master' into patch-1

filmor · web-flow · commit f0c5f62436ce · 2018-05-28T11:50:30.000+02:00
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
@@ -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/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();
         }
 
 

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`