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