Backport fix for http://bugs.python.org/setuptools/issue47 from trunk

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4066599

1 files changed, 3 insertions, 3 deletions

diff --git a/ez_setup.py b/ez_setup.py
index de027514..c303dcfa 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -48,10 +48,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, (
@@ -61,7 +62,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
@@ -230,7 +230,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)
@@ -267,3 +266,4 @@ if __name__=='__main__':
 
 
 
+