Author: brett.cannon Date: Thu May 31 21:20:00 2007 New Revision: 55716 Modified: python/trunk/Lib/sha.py python/trunk/Lib/test/test_hmac.py python/trunk/Lib/test/test_pep247.py python/trunk/Lib/test/test_sha.py python/trunk/Lib/uuid.py python/trunk/Misc/NEWS Log: Have the sha module raise a DeprecationWarning as specified in PEP 4. Modified: python/trunk/Lib/sha.py ============================================================================== --- python/trunk/Lib/sha.py (original) +++ python/trunk/Lib/sha.py Thu May 31 21:20:00 2007 @@ -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 sha module is deprecated; use the hashlib module instead", + DeprecationWarning, 2) + from hashlib import sha1 as sha new = sha Modified: python/trunk/Lib/test/test_hmac.py ============================================================================== --- python/trunk/Lib/test/test_hmac.py (original) +++ python/trunk/Lib/test/test_hmac.py Thu May 31 21:20:00 2007 @@ -1,5 +1,5 @@ import hmac -import sha +from hashlib import sha1 import unittest from test import test_support @@ -43,7 +43,7 @@ def test_sha_vectors(self): def shatest(key, data, digest): - h = hmac.HMAC(key, data, digestmod=sha) + h = hmac.HMAC(key, data, digestmod=sha1) self.assertEqual(h.hexdigest().upper(), digest.upper()) shatest(chr(0x0b) * 20, @@ -95,11 +95,11 @@ def test_withmodule(self): # Constructor call with text and digest module. - import sha + from hashlib import sha1 try: - h = hmac.HMAC("key", "", sha) + h = hmac.HMAC("key", "", sha1) except: - self.fail("Constructor call with sha module raised exception.") + self.fail("Constructor call with hashlib.sha1 raised exception.") class SanityTestCase(unittest.TestCase): Modified: python/trunk/Lib/test/test_pep247.py ============================================================================== --- python/trunk/Lib/test/test_pep247.py (original) +++ python/trunk/Lib/test/test_pep247.py Thu May 31 21:20:00 2007 @@ -6,6 +6,8 @@ import warnings warnings.filterwarnings("ignore", "the md5 module is deprecated.*", DeprecationWarning) +warnings.filterwarnings("ignore", "the sha module is deprecated.*", + DeprecationWarning) import md5, sha, hmac Modified: python/trunk/Lib/test/test_sha.py ============================================================================== --- python/trunk/Lib/test/test_sha.py (original) +++ python/trunk/Lib/test/test_sha.py Thu May 31 21:20:00 2007 @@ -4,6 +4,10 @@ # Publication 180-1, Secure Hash Standard, 1995 April 17 # http://www.itl.nist.gov/div897/pubs/fip180-1.htm +import warnings +warnings.filterwarnings("ignore", "the sha module is deprecated.*", + DeprecationWarning) + import sha import unittest from test import test_support Modified: python/trunk/Lib/uuid.py ============================================================================== --- python/trunk/Lib/uuid.py (original) +++ python/trunk/Lib/uuid.py Thu May 31 21:20:00 2007 @@ -529,8 +529,8 @@ def uuid5(namespace, name): """Generate a UUID from the SHA-1 hash of a namespace UUID and a name.""" - import sha - hash = sha.sha(namespace.bytes + name).digest() + from hashlib import sha1 + hash = sha1(namespace.bytes + name).digest() return UUID(bytes=hash[:16], version=5) # The following standard UUIDs are for use with uuid3() or uuid5(). Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu May 31 21:20:00 2007 @@ -220,6 +220,8 @@ Library ------- +- sha now raises a DeprecationWarning upon import. + - md5 now raises a DeprecationWarning upon import. - mimify now raises a DeprecationWarning upon import.