merge 3.3

48a2e7c3 · Benjamin Peterson · af94051a · 51ce29c5 · 48a2e7c3
Kaydet (Commit) 48a2e7c3 authored Nis 16, 2013 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

sha1module.c Modules/sha1module.c +2 -7

No files found.
--- a/Modules/sha1module.c
+++ b/Modules/sha1module.c
@@ -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;