[Python-checkins] r66598 - sandbox/trunk/setuptools/ez_setup.py

[phillip.eby]

Author: phillip.eby
Date: Wed Sep 24 18:52:29 2008
New Revision: 66598

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


Modified:
   sandbox/trunk/setuptools/ez_setup.py

Modified: sandbox/trunk/setuptools/ez_setup.py
==============================================================================
--- sandbox/trunk/setuptools/ez_setup.py	(original)
+++ sandbox/trunk/setuptools/ez_setup.py	Wed Sep 24 18:52:29 2008
@@ -25,10 +25,11 @@
 }
 
 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 @@
             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 @@
     """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 @@
 
 
 
+