diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2010-01-03 00:38:10 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2010-01-03 00:38:10 (GMT) |
| commit | b04ded4927c411908ae45154b194ac08cf819a42 (patch) | |
| tree | 8fb2dde448f9b6aad8bf163ea424fd1f24d67325 /Lib | |
| parent | cd54e546bb70e5e9abeb2b6d2ca9031507015f60 (diff) | |
| download | cpython-b04ded4927c411908ae45154b194ac08cf819a42.zip cpython-b04ded4927c411908ae45154b194ac08cf819a42.tar.gz cpython-b04ded4927c411908ae45154b194ac08cf819a42.tar.bz2 | |
Also fixes test_hashlib for the different extension module names in py3k.
Merged revisions 77251 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77251 | gregory.p.smith | 2010-01-02 14:25:29 -0800 (Sat, 02 Jan 2010) | 6 lines
Always compile the all versions of the hashlib algorithm modules when Python
was compiled with Py_DEBUG defined. Otherwise the builtins are not compiled by
default for many developers due to OpenSSL being present, making it easier for
bugs to slip by. A future commit will add test code compare the behaviors of
all implementations when they are all available.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_hashlib.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 9f702e9..652c60e 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -78,10 +78,10 @@ class HashLibTestCase(unittest.TestCase): _md5 = self._conditional_import_module('_md5') if _md5: - self.constructors_to_test['md5'].add(_md5.new) - _sha = self._conditional_import_module('_sha') - if _sha: - self.constructors_to_test['sha1'].add(_sha.new) + self.constructors_to_test['md5'].add(_md5.md5) + _sha1 = self._conditional_import_module('_sha1') + if _sha1: + self.constructors_to_test['sha1'].add(_sha1.sha1) _sha256 = self._conditional_import_module('_sha256') if _sha256: self.constructors_to_test['sha224'].add(_sha256.sha224) |