diff options
| author | PJ Eby <distutils-sig@python.org> | 2008-08-21 18:00:54 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2008-08-21 18:00:54 +0000 |
| commit | 2d3007539b9ed75f8f5d5a35284640a03235f422 (patch) | |
| tree | 7b759dba5cb51d2747c4742503d6e19c0d8f6d1f /setuptools/command/upload.py | |
| parent | 3430324f7fcd38e9d1a8c045812e80376292788e (diff) | |
| download | external_python_setuptools-2d3007539b9ed75f8f5d5a35284640a03235f422.tar.gz external_python_setuptools-2d3007539b9ed75f8f5d5a35284640a03235f422.tar.bz2 external_python_setuptools-2d3007539b9ed75f8f5d5a35284640a03235f422.zip | |
Fix for http://bugs.python.org/setuptools/issue5 (backport from trunk)
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4065945
Diffstat (limited to 'setuptools/command/upload.py')
| -rwxr-xr-x | setuptools/command/upload.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index e91b8540..7ac08c22 100755 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -6,7 +6,10 @@ from distutils.errors import * from distutils.core import Command from distutils.spawn import spawn from distutils import log -from md5 import md5 +try: + from hashlib import md5 +except ImportError: + from md5 import md5 import os import socket import platform |