[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/0b361bc74f02
changeset:   83403:0b361bc74f02
parent:      83401:5a16d2992112
parent:      83402:aec657f11b66
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 15 21:38:33 2013 -0400
summary:
  merge 3.3

files:
  Modules/sha1module.c |  9 ++-------
  1 files changed, 2 insertions(+), 7 deletions(-)


diff --git a/Modules/sha1module.c b/Modules/sha1module.c
--- a/Modules/sha1module.c
+++ b/Modules/sha1module.c
@@ -320,13 +320,8 @@
 {
     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;

-- 
Repository URL: http://hg.python.org/cpython