From: Brett Cannon Date: Wed, 30 May 2007 22:24:28 +0000 (+0000) Subject: Have md5 raise a DeprecationWarning as per PEP 4. X-Git-Tag: v2.6a1~1672 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7eec2179081c86e1a79c5f17b43346e14fc8fb53;p=python Have md5 raise a DeprecationWarning as per PEP 4. --- diff --git a/Lib/md5.py b/Lib/md5.py index bbe1984d14..f6433ccbc9 100644 --- a/Lib/md5.py +++ b/Lib/md5.py @@ -3,6 +3,10 @@ # Copyright (C) 2005 Gregory P. Smith (greg@electricrain.com) # 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 new = md5 diff --git a/Lib/test/test_md5.py b/Lib/test/test_md5.py index 1f08568508..2c0e8e2ca9 100644 --- a/Lib/test/test_md5.py +++ b/Lib/test/test_md5.py @@ -1,4 +1,7 @@ # Testing md5 module +import warnings +warnings.filterwarnings("ignore", "the md5 module is deprecated.*", + DeprecationWarning) import unittest from md5 import md5 diff --git a/Lib/test/test_pep247.py b/Lib/test/test_pep247.py index 88f246131b..1eb9462703 100644 --- a/Lib/test/test_pep247.py +++ b/Lib/test/test_pep247.py @@ -3,6 +3,10 @@ # hashing algorithms. # +import warnings +warnings.filterwarnings("ignore", "the md5 module is deprecated.*", + DeprecationWarning) + import md5, sha, hmac def check_hash_module(module, key=None): diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 04f9ba5ac8..67e52e904f 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -5,7 +5,7 @@ import os import shutil import tempfile import StringIO -import md5 +from hashlib import md5 import errno import unittest @@ -25,7 +25,7 @@ except ImportError: bz2 = None def md5sum(data): - return md5.new(data).hexdigest() + return md5(data).hexdigest() def path(path): return test_support.findfile(path) diff --git a/Lib/uuid.py b/Lib/uuid.py index ae3da25ca5..eb12d7810a 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -506,8 +506,8 @@ def uuid1(node=None, clock_seq=None): def uuid3(namespace, name): """Generate a UUID from the MD5 hash of a namespace UUID and a name.""" - import md5 - hash = md5.md5(namespace.bytes + name).digest() + from hashlib import md5 + hash = md5(namespace.bytes + name).digest() return UUID(bytes=hash[:16], version=3) def uuid4(): diff --git a/Misc/NEWS b/Misc/NEWS index 8f4bcebb8c..c1f3763b28 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -220,6 +220,8 @@ Core and builtins Library ------- +- md5 now raises a DeprecationWarning upon import. + - mimify now raises a DeprecationWarning upon import. - MimeWriter now raises a DeprecationWarning upon import.