From b52c96fe479e4b30d19dd6be62a032791ac20ba3 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 17 May 2014 13:09:19 -0400 Subject: Remove an unneeded backward function, and move BUILTINS into backward --- coverage/backward.py | 8 ++++++++ coverage/execfile.py | 18 ++---------------- 2 files changed, 10 insertions(+), 16 deletions(-) (limited to 'coverage') diff --git a/coverage/backward.py b/coverage/backward.py index 8d728117..98407e38 100644 --- a/coverage/backward.py +++ b/coverage/backward.py @@ -127,6 +127,14 @@ except ImportError: md5 = md5.new +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'] + + # imp was deprecated in Python 3.4 try: import importlib, importlib.util 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: -- cgit v1.2.1