Commit 2eb4eeaf authored by Vinay Sajip's avatar Vinay Sajip

Minor change to minimise diffs with upstream.

--HG--
branch : single-codebase
parent 9ea9ca10
...@@ -40,7 +40,6 @@ try: ...@@ -40,7 +40,6 @@ try:
except NameError: except NameError:
basestring = str basestring = str
from io import StringIO from io import StringIO
from functools import reduce
exec_ = eval("exec") exec_ = eval("exec")
def execfile(fn, globs=None, locs=None): def execfile(fn, globs=None, locs=None):
if globs is None: if globs is None:
...@@ -48,6 +47,8 @@ except NameError: ...@@ -48,6 +47,8 @@ except NameError:
if locs is None: if locs is None:
locs = globs locs = globs
exec_(compile(open(fn).read(), fn, 'exec'), globs, locs) exec_(compile(open(fn).read(), fn, 'exec'), globs, locs)
import functools
reduce = functools.reduce
# capture these to bypass sandboxing # capture these to bypass sandboxing
from os import utime from os import utime
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment