Merge remote branch 'jason/devel' into devel

Conflicts:
	psycopg/notify_type.c

psycopg/notify_type.c

@@ -189,10 +189,10 @@ exit:
 }
 
 
-static long
+static Py_hash_t
 notify_hash(NotifyObject *self)
 {
-    long rv = -1L;
+    Py_hash_t rv = -1L;
     PyObject *tself = NULL;
 
     /* if self == a tuple, then their hashes are the same. */

psycopg/python.h

@@ -54,6 +54,15 @@
   #define CONV_CODE_PY_SSIZE_T "n"
 #endif
 
+/* hash() return size changed around version 3.2a4 on 64bit platforms.  Before
+ *   this, the return size was always a long, regardless of arch.  ~3.2 
+ *   introduced the Py_hash_t & Py_uhash_t typedefs with the resulting sizes
+ *   based upon arch. */
+#if PY_VERSION_HEX < 0x030200A4
+typedef long Py_hash_t;
+typedef unsigned long Py_uhash_t;
+#endif
+
 /* Macros defined in Python 2.6 */
 #ifndef Py_REFCNT
 #define Py_REFCNT(ob)           (((PyObject*)(ob))->ob_refcnt)

tests/test_connection.py

@@ -119,7 +119,7 @@ class ConnectionTests(unittest.TestCase):
         def slave():
             cnn = psycopg2.connect(dsn)
             cur = cnn.cursor()
-            cur.execute("select pg_sleep(3)")
+            cur.execute("select pg_sleep(4)")
             cur.close()
             cnn.close()
 
@@ -130,7 +130,7 @@ class ConnectionTests(unittest.TestCase):
         t2.start()
         t1.join()
         t2.join()
-        self.assert_(time.time() - t0 < 5,
+        self.assert_(time.time() - t0 < 7,
             "something broken in concurrency")
 
     def test_encoding_name(self):