Merge pull request #39 from NextThought/issue38

Fix #38 by returning the correct type from TimeStamp_hash.
zopefoundation · May 26, 2016 · 68c26c4 · 68c26c4
2 parents 1df6a6e + edd3e63
commit 68c26c4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 ``persistent`` Changelog
 ========================
 
+4.2.1 (TBD)
+-----------
+
+- Fix the hashcode of C ``TimeStamp`` objects on 64-bit Python 3 on
+  Windows.
+
 4.2.0 (2016-05-05)
 ------------------
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,8 +6,11 @@ environment:
     - python : 27
     - python : 27-x64
     - python : 33
+    - python : 33-x64
     - python : 34
-    - python : 35	
+    - python : 34-x64
+    - python : 35
+    - python : 35-x64
 
 install:
   - "SET PATH=C:\\Python%PYTHON%;c:\\Python%PYTHON%\\scripts;%PATH%"

diff --git a/persistent/_timestamp.c b/persistent/_timestamp.c
@@ -152,7 +152,12 @@ TimeStamp_richcompare(TimeStamp *self, TimeStamp *other, int op)
     return result;
 }
 
+
+#ifdef PY3K
+static Py_hash_t
+#else
 static long
+#endif
 TimeStamp_hash(TimeStamp *self)
 {
     register unsigned char *p = (unsigned char *)self->data;