diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-04-16 01:38:33 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-04-16 01:38:33 (GMT) |
| commit | 48a2e7c357b7f2148ada9473c796351cc562284b (patch) | |
| tree | 21413076a8a0900b202f8257e152fd534c139056 /Modules | |
| parent | af94051a933b7fbd9c63b0a45cfba5247d92ac14 (diff) | |
| parent | 51ce29c530f598d306de27724875cf37007422fc (diff) | |
| download | cpython-48a2e7c357b7f2148ada9473c796351cc562284b.zip cpython-48a2e7c357b7f2148ada9473c796351cc562284b.tar.gz cpython-48a2e7c357b7f2148ada9473c796351cc562284b.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/sha1module.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Modules/sha1module.c b/Modules/sha1module.c index 52ef8a9..d39f192 100644 --- 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; |