diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2014-05-17 13:09:19 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2014-05-17 13:09:19 -0400 |
commit | 503cdc25c6e5410e920053e3c4a819e962c4f6e8 (patch) | |
tree | 3c2886ae5ca7104eeff9f1023a6dade28a0487fa /coverage/execfile.py | |
parent | 9534b2a2572820b15808079663348ab359242e3b (diff) | |
download | python-coveragepy-503cdc25c6e5410e920053e3c4a819e962c4f6e8.tar.gz |
Remove an unneeded backward function, and move BUILTINS into backward
Diffstat (limited to 'coverage/execfile.py')
-rw-r--r-- | coverage/execfile.py | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/coverage/execfile.py b/coverage/execfile.py index f5a53c8..bc8fdaa 100644 --- a/coverage/execfile.py +++ b/coverage/execfile.py @@ -2,25 +2,11 @@ import marshal, os, sys, types -from coverage.backward import open_python_source +from coverage.backward import open_python_source, BUILTINS from coverage.backward import PYC_MAGIC_NUMBER, imp, importlib from coverage.misc import ExceptionDuringRun, NoCode, NoSource -try: - # In Py 2.x, the builtins were in __builtin__ - BUILTINS = sys.modules['__builtin__'] -except KeyError: - # In Py 3.x, they're in builtins - BUILTINS = sys.modules['builtins'] - - -def rsplit1(s, sep): - """The same as s.rsplit(sep, 1), but works in 2.3""" - parts = s.split(sep) - return sep.join(parts[:-1]), parts[-1] - - if importlib: def find_module(modulename): """Find the module named `modulename`. @@ -63,7 +49,7 @@ else: # Search for the module - inside its parent package, if any - using # standard import mechanics. if '.' in modulename: - packagename, name = rsplit1(modulename, '.') + packagename, name = modulename.rsplit('.', 1) package = __import__(packagename, glo, loc, ['__path__']) searchpath = package.__path__ else: |