From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Apr 2012 19:01:02 +0000 (-0400)
Subject: merge 3.1 (#14509)
X-Git-Tag: v3.3.0a3~269^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca819c3c9d2651bcaeec311915a83dd176acbd13;p=thirdparty%2FPython%2Fcpython.git

merge 3.1 (#14509)
---

ca819c3c9d2651bcaeec311915a83dd176acbd13
diff --cc Objects/bytesobject.c
index 62ddf2153279,a0c121ededf5..796e400a8220
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@@ -873,9 -894,11 +873,11 @@@ bytes_hash(PyBytesObject *a
  {
      register Py_ssize_t len;
      register unsigned char *p;
 -    register long x;
 +    register Py_hash_t x;
  
+ #ifdef Py_DEBUG
      assert(_Py_HashSecret_Initialized);
+ #endif
      if (a->ob_shash != -1)
          return a->ob_shash;
      len = Py_SIZE(a);
diff --cc Objects/unicodeobject.c
index a5ffc56260a8,341114f9431b..cd17789f53bb
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@@ -7671,9 -7339,11 +7671,11 @@@ unicode_hash(PyUnicodeObject *self
  {
      Py_ssize_t len;
      Py_UNICODE *p;
 -    long x;
 +    Py_hash_t x;
  
+ #ifdef Py_DEBUG
      assert(_Py_HashSecret_Initialized);
+ #endif
      if (self->hash != -1)
          return self->hash;
      len = Py_SIZE(self);