summaryrefslogtreecommitdiff
path: root/setuptools/command
diff options
context:
space:
mode:
authorphillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771>2008-08-21 17:59:52 +0000
committerphillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771>2008-08-21 17:59:52 +0000
commitdb7c472d63742f37caafea3fadb2ea01d2c19750 (patch)
treed5cc1d57bb2a5c85496363921435c540c2123444 /setuptools/command
parentc94e11f946f84997600c5adf204cc739caee802d (diff)
downloadpython-setuptools-db7c472d63742f37caafea3fadb2ea01d2c19750.tar.gz
Fix for http://bugs.python.org/setuptools/issue5
git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@65944 6015fed2-1504-0410-9fe1-9d1591cc4771
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/upload.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index e91b854..7ac08c2 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