Consolidate the occurrances of the prime used as the multiplier when hashing.
diff --git a/Include/pyport.h b/Include/pyport.h
index 5309de6..1fd4dcc 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -131,6 +131,9 @@
#endif
#endif
+/* Prime multiplier used in string and various other hashes. */
+#define _PyHASH_MULTIPLIER 1000003 /* 0xf4243 */
+
/* Parameters used for the numeric hash implementation. See notes for
_Py_HashDouble in Objects/object.c. Numeric hashes are based on
reduction modulo the prime 2**_PyHASH_BITS - 1. */
@@ -143,7 +146,7 @@
#define _PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1)
#define _PyHASH_INF 314159
#define _PyHASH_NAN 0
-#define _PyHASH_IMAG 1000003UL
+#define _PyHASH_IMAG _PyHASH_MULTIPLIER
/* uintptr_t is the C9X name for an unsigned integral type such that a
* legitimate void* can be cast to uintptr_t and then back to void* again
diff --git a/Objects/object.c b/Objects/object.c
index 9060c82..441068d 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -761,7 +761,7 @@
x = (Py_uhash_t) *p << 7;
for (i = 0; i < len; i++)
- x = (1000003U * x) ^ (Py_uhash_t) *p++;
+ x = (_PyHASH_MULTIPLIER * x) ^ (Py_uhash_t) *p++;
x ^= (Py_uhash_t) len;
if (x == -1)
x = -2;
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index 54a580d..d58839e 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -316,7 +316,7 @@
register Py_hash_t y;
register Py_ssize_t len = Py_SIZE(v);
register PyObject **p;
- Py_uhash_t mult = 1000003;
+ Py_uhash_t mult = _PyHASH_MULTIPLIER;
x = 0x345678;
p = v->ob_item;
while (--len >= 0) {
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index e97ce1f..59fc123 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -11210,7 +11210,7 @@
#define HASH(P) \
x = (Py_uhash_t)*P << 7; \
while (--len >= 0) \
- x = (1000003*x) ^ (Py_uhash_t)*P++;
+ x = (_PyHASH_MULTIPLIER*x) ^ (Py_uhash_t)*P++;
switch (PyUnicode_KIND(self)) {
case PyUnicode_1BYTE_KIND: {