merge 3.3

This commit is contained in:
Benjamin Peterson 2013-04-15 21:38:33 -04:00
commit 48a2e7c357
1 changed files with 2 additions and 7 deletions

View File

@ -320,13 +320,8 @@ SHA1_copy(SHA1object *self, PyObject *unused)
{
SHA1object *newobj;
if (Py_TYPE(self) == &SHA1type) {
if ( (newobj = newSHA1object())==NULL)
return NULL;
} else {
if ( (newobj = newSHA1object())==NULL)
return NULL;
}
if ((newobj = newSHA1object()) == NULL)
return NULL;
newobj->hash_state = self->hash_state;
return (PyObject *)newobj;