diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/backward.py | 17 | ||||
| -rw-r--r-- | coverage/collector.py | 11 | ||||
| -rw-r--r-- | coverage/pytracer.py | 2 | ||||
| -rw-r--r-- | coverage/test_helpers.py | 10 |
4 files changed, 7 insertions, 33 deletions
diff --git a/coverage/backward.py b/coverage/backward.py index 11f8e00b..9597449c 100644 --- a/coverage/backward.py +++ b/coverage/backward.py @@ -50,22 +50,7 @@ else: if sys.version_info >= (3, 0): # Python 3.2 provides `tokenize.open`, the best way to open source files. import tokenize - try: - open_python_source = tokenize.open # pylint: disable=E1101 - except AttributeError: - from io import TextIOWrapper - detect_encoding = tokenize.detect_encoding # pylint: disable=E1101 - # Copied from the 3.2 stdlib: - def open_python_source(fname): - """Open a file in read only mode using the encoding detected by - detect_encoding(). - """ - buffer = open(fname, 'rb') - encoding, _ = detect_encoding(buffer.readline) - buffer.seek(0) - text = TextIOWrapper(buffer, encoding, line_buffering=True) - text.mode = 'r' - return text + open_python_source = tokenize.open # pylint: disable=E1101 else: def open_python_source(fname): """Open a source file the best way.""" diff --git a/coverage/collector.py b/coverage/collector.py index dccd797e..8ff4db2c 100644 --- a/coverage/collector.py +++ b/coverage/collector.py @@ -196,12 +196,11 @@ class Collector(object): # Check to see whether we had a fullcoverage tracer installed. traces0 = [] - if hasattr(sys, "gettrace"): - fn0 = sys.gettrace() - if fn0: - tracer0 = getattr(fn0, '__self__', None) - if tracer0: - traces0 = getattr(tracer0, 'traces', []) + fn0 = sys.gettrace() + if fn0: + tracer0 = getattr(fn0, '__self__', None) + if tracer0: + traces0 = getattr(tracer0, 'traces', []) # Install the tracer on this thread. fn = self._start_tracer() diff --git a/coverage/pytracer.py b/coverage/pytracer.py index a82b32c9..7563ae11 100644 --- a/coverage/pytracer.py +++ b/coverage/pytracer.py @@ -151,7 +151,7 @@ class PyTracer(object): # do any more tracing. return - if hasattr(sys, "gettrace") and self.warn: + if self.warn: if sys.gettrace() != self._trace: msg = "Trace function changed, measurement is likely wrong: %r" self.warn(msg % (sys.gettrace(),)) diff --git a/coverage/test_helpers.py b/coverage/test_helpers.py index 1bc17048..efe68dcd 100644 --- a/coverage/test_helpers.py +++ b/coverage/test_helpers.py @@ -90,16 +90,6 @@ class EnvironmentAwareMixin(TestCase): self.environ_undos[name] = os.environ.get(name) os.environ[name] = value - def original_environ(self, name, if_missing=None): - """The environment variable `name` from when the test started.""" - if name in self.environ_undos: - ret = self.environ_undos[name] - else: - ret = os.environ.get(name) - if ret is None: - ret = if_missing - return ret - def cleanup_environ(self): """Undo all the changes made by `set_environ`.""" for name, value in self.environ_undos.items(): |