traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 2.7 release branch

This commit is contained in:
Benjamin Peterson 2012-04-09 14:54:09 -04:00
parent b5588c3f94 f51c384a0a
commit fe146ea3c7
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Objects/stringobject.c
View File

@ -1262,7 +1262,9 @@ string_hash(PyStringObject *a)
register unsigned char *p; register unsigned char *p;
register long x; register long x;
#ifdef Py_DEBUG
assert(_Py_HashSecret_Initialized); assert(_Py_HashSecret_Initialized);
#endif
if (a->ob_shash != -1) if (a->ob_shash != -1)
return a->ob_shash; return a->ob_shash;
len = Py_SIZE(a); len = Py_SIZE(a);

2
Objects/unicodeobject.c
View File

@ -6538,7 +6538,9 @@ unicode_hash(PyUnicodeObject *self)
register Py_UNICODE *p; register Py_UNICODE *p;
register long x; register long x;
#ifdef Py_DEBUG
assert(_Py_HashSecret_Initialized); assert(_Py_HashSecret_Initialized);
#endif
if (self->hash != -1) if (self->hash != -1)
return self->hash; return self->hash;
len = PyUnicode_GET_SIZE(self); len = PyUnicode_GET_SIZE(self);