Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 246406 | Differences between
and this patch

Collapse All | Expand All

(-)a/Hash/MD5.py (-6 / +16 lines)
Lines 3-13 Link Here
3
3
4
__revision__ = "$Id$"
4
__revision__ = "$Id$"
5
5
6
from md5 import *
6
__all__ = ['new', 'digest_size']
7
7
8
import md5
8
try:
9
if hasattr(md5, 'digestsize'):
9
    # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
10
    digest_size = digestsize
10
    import hashlib
11
    del digestsize
11
    def new(data=""):
12
del md5
12
        return hashlib.md5(data)
13
    digest_size = new().digest_size
14
15
except ImportError:
16
    from md5 import *
17
18
    import md5
19
    if hasattr(md5, 'digestsize'):
20
        digest_size = digestsize
21
        del digestsize
22
    del md5
13
23
(-)a/Hash/SHA.py (-7 / +16 lines)
Lines 3-11 Link Here
3
3
4
__revision__ = "$Id$"
4
__revision__ = "$Id$"
5
5
6
from sha import *
6
__all__ = ['new', 'digest_size']
7
import sha
7
8
if hasattr(sha, 'digestsize'):
8
try:
9
    digest_size = digestsize
9
    # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
10
    del digestsize
10
    import hashlib
11
del sha
11
    def new(data=""):
12
        return hashlib.sha1(data)
13
    digest_size = new().digest_size
14
15
except ImportError:
16
    from sha import *
17
    import sha
18
    if hasattr(sha, 'digestsize'):
19
        digest_size = digestsize
20
        del digestsize
21
    del sha
12
--
(-)a/Hash/HMAC.py (-2 / +2 lines)
Lines 33-40 class HMAC: Link Here
33
        digestmod: A module supporting PEP 247. Defaults to the md5 module.
33
        digestmod: A module supporting PEP 247. Defaults to the md5 module.
34
        """
34
        """
35
        if digestmod == None:
35
        if digestmod == None:
36
            import md5
36
            import MD5
37
            digestmod = md5
37
            digestmod = MD5
38
38
39
        self.digestmod = digestmod
39
        self.digestmod = digestmod
40
        self.outer = digestmod.new()
40
        self.outer = digestmod.new()

Return to bug 246406