summaryrefslogtreecommitdiff
path: root/coverage/execfile.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2014-05-17 13:09:19 -0400
committerNed Batchelder <ned@nedbatchelder.com>2014-05-17 13:09:19 -0400
commitb52c96fe479e4b30d19dd6be62a032791ac20ba3 (patch)
tree805bbf0d6dc13c09f9e4ae286ab224cac3d4d15f /coverage/execfile.py
parentbfb18a479b78645f973f20489021f374c008262f (diff)
downloadpython-coveragepy-git-b52c96fe479e4b30d19dd6be62a032791ac20ba3.tar.gz
Remove an unneeded backward function, and move BUILTINS into backward
Diffstat (limited to 'coverage/execfile.py')
-rw-r--r--coverage/execfile.py18
1 files changed, 2 insertions, 16 deletions
diff --git a/coverage/execfile.py b/coverage/execfile.py
index f5a53c80..bc8fdaa2 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: