Have md5 raise a DeprecationWarning as per PEP 4.

This commit is contained in:
Brett Cannon 2007-05-30 22:24:28 +00:00
parent c249bdab92
commit 7eec217908
6 changed files with 17 additions and 4 deletions

View file

@ -3,6 +3,10 @@
# Copyright (C) 2005 Gregory P. Smith (greg@electricrain.com) # Copyright (C) 2005 Gregory P. Smith (greg@electricrain.com)
# Licensed to PSF under a Contributor Agreement. # Licensed to PSF under a Contributor Agreement.
import warnings
warnings.warn("the md5 module is deprecated; use hashlib instead",
DeprecationWarning, 2)
from hashlib import md5 from hashlib import md5
new = md5 new = md5

View file

@ -1,4 +1,7 @@
# Testing md5 module # Testing md5 module
import warnings
warnings.filterwarnings("ignore", "the md5 module is deprecated.*",
DeprecationWarning)
import unittest import unittest
from md5 import md5 from md5 import md5

View file

@ -3,6 +3,10 @@
# hashing algorithms. # hashing algorithms.
# #
import warnings
warnings.filterwarnings("ignore", "the md5 module is deprecated.*",
DeprecationWarning)
import md5, sha, hmac import md5, sha, hmac
def check_hash_module(module, key=None): def check_hash_module(module, key=None):

View file

@ -5,7 +5,7 @@ import os
import shutil import shutil
import tempfile import tempfile
import StringIO import StringIO
import md5 from hashlib import md5
import errno import errno
import unittest import unittest
@ -25,7 +25,7 @@ except ImportError:
bz2 = None bz2 = None
def md5sum(data): def md5sum(data):
return md5.new(data).hexdigest() return md5(data).hexdigest()
def path(path): def path(path):
return test_support.findfile(path) return test_support.findfile(path)

View file

@ -506,8 +506,8 @@ def uuid1(node=None, clock_seq=None):
def uuid3(namespace, name): def uuid3(namespace, name):
"""Generate a UUID from the MD5 hash of a namespace UUID and a name.""" """Generate a UUID from the MD5 hash of a namespace UUID and a name."""
import md5 from hashlib import md5
hash = md5.md5(namespace.bytes + name).digest() hash = md5(namespace.bytes + name).digest()
return UUID(bytes=hash[:16], version=3) return UUID(bytes=hash[:16], version=3)
def uuid4(): def uuid4():

View file

@ -220,6 +220,8 @@ Core and builtins
Library Library
------- -------
- md5 now raises a DeprecationWarning upon import.
- mimify now raises a DeprecationWarning upon import. - mimify now raises a DeprecationWarning upon import.
- MimeWriter now raises a DeprecationWarning upon import. - MimeWriter now raises a DeprecationWarning upon import.