Fix for http://bugs.python.org/setuptools/issue47 - more md5 usage

git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@66598 6015fed2-1504-0410-9fe1-9d1591cc4771

1 files changed, 3 insertions, 3 deletions

diff --git a/ez_setup.py b/ez_setup.py
index 1709ff7..fd9d80f 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -25,10 +25,11 @@ md5_data = {
 }
 
 import sys, os
+try: from hashlib import md5
+except ImportError: from md5 import md5
 
 def _validate_md5(egg_name, data):
     if egg_name in md5_data:
-        from md5 import md5
         digest = md5(data).hexdigest()
         if digest != md5_data[egg_name]:
             print >>sys.stderr, (
@@ -38,7 +39,6 @@ def _validate_md5(egg_name, data):
             sys.exit(2)
     return data
 
-
 def use_setuptools(
     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
     download_delay=15
@@ -207,7 +207,6 @@ def update_md5(filenames):
     """Update our built-in md5 registry"""
 
     import re
-    from md5 import md5
 
     for name in filenames:
         base = os.path.basename(name)
@@ -244,3 +243,4 @@ if __name__=='__main__':
 
 
 
+