[Python-checkins] r66599 - sandbox/branches/setuptools-0.6/ez_setup.py

[phillip.eby]

Author: phillip.eby
Date: Wed Sep 24 18:53:14 2008
New Revision: 66599

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


Modified:
   sandbox/branches/setuptools-0.6/ez_setup.py

Modified: sandbox/branches/setuptools-0.6/ez_setup.py
==============================================================================
--- sandbox/branches/setuptools-0.6/ez_setup.py	(original)
+++ sandbox/branches/setuptools-0.6/ez_setup.py	Wed Sep 24 18:53:14 2008
@@ -48,10 +48,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, (
@@ -61,7 +62,6 @@
             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 @@
     """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 @@
 
 
 
+