aboutsummaryrefslogtreecommitdiffstats
path: root/pkg_resources.py
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
commit2eb4eeaf4e06d8bcf3cf1288ae2d6a53ef96f59d (patch)
treec7dedd792392c52b242ed8285d48663e3f6b287b /pkg_resources.py
parent9ea9ca10b152b97e6eeb57da26aed8f88cc67136 (diff)
downloadexternal_python_setuptools-2eb4eeaf4e06d8bcf3cf1288ae2d6a53ef96f59d.tar.gz
external_python_setuptools-2eb4eeaf4e06d8bcf3cf1288ae2d6a53ef96f59d.tar.bz2
external_python_setuptools-2eb4eeaf4e06d8bcf3cf1288ae2d6a53ef96f59d.zip
Minor change to minimise diffs with upstream.
--HG-- branch : single-codebase
Diffstat (limited to 'pkg_resources.py')
-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