summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-06-19 12:38:18 +0100
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-06-19 12:38:18 +0100
commit90e99d86ceabf0a6dcde6152ddad187f4c96fdbe (patch)
tree577834ed752eeb3dd7d24aa24d35af2c9d44b91f
parentbb59437efdd6c528cac4d907c2d8dc07a4461598 (diff)
downloadpython-setuptools-bitbucket-90e99d86ceabf0a6dcde6152ddad187f4c96fdbe.tar.gz
Minor change to minimise diffs with upstream.
-rw-r--r--pkg_resources.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index e03667e0..09788364 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -40,7 +40,6 @@ try:
except NameError:
basestring = str
from io import StringIO
- from functools import reduce
exec_ = eval("exec")
def execfile(fn, globs=None, locs=None):
if globs is None:
@@ -48,6 +47,8 @@ except NameError:
if locs is None:
locs = globs
exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
+ import functools
+ reduce = functools.reduce
# capture these to bypass sandboxing
from os import utime