summaryrefslogtreecommitdiff
path: root/setuptools/py24compat.py
diff options
context:
space:
mode:
authorPhilip Thiem <ptthiem@gmail.com>2013-07-20 18:10:50 -0500
committerPhilip Thiem <ptthiem@gmail.com>2013-07-20 18:10:50 -0500
commita6e7ef0ae1e0ea1f147a2196efe7f2b82c301fe2 (patch)
tree8f73e0285965d86cbb6b8d8bc599789fd4a924ef /setuptools/py24compat.py
parent37c48a4da11b40a5a8a3c801525b637bb2934df1 (diff)
parent70067439d3b2b53cf2112ed0faf52c30b30ef3cd (diff)
downloadpython-setuptools-git-a6e7ef0ae1e0ea1f147a2196efe7f2b82c301fe2.tar.gz
Merge with default
--HG-- extra : rebase_source : 15517dca4272e2b088930cb5599f5822cef13bae
Diffstat (limited to 'setuptools/py24compat.py')
-rw-r--r--setuptools/py24compat.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/setuptools/py24compat.py b/setuptools/py24compat.py
index c5d7d204..40e9ae0f 100644
--- a/setuptools/py24compat.py
+++ b/setuptools/py24compat.py
@@ -9,3 +9,9 @@ except ImportError:
def wraps(func):
"Just return the function unwrapped"
return lambda x: x
+
+
+try:
+ import hashlib
+except ImportError:
+ from setuptools._backport import hashlib