diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2017-08-04 09:21:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 09:21:51 +0200 |
| commit | 9e62a31b63c9436d7e5a0e45b39a3f9f562b9baf (patch) | |
| tree | fa279bd324f71f680791ad03889dbe57c5588653 /_pytest/_code/code.py | |
| parent | 40254b64e567d2fc82d9168723fdadced3674246 (diff) | |
| parent | 2e33d9b35ed1ac09bf06c63496ce1abb7b7cb651 (diff) | |
| download | pytest-9e62a31b63c9436d7e5a0e45b39a3f9f562b9baf.tar.gz | |
Merge pull request #2650 from srinivasreddy/2642
Fixed#2642: Convert py module references to six module
Diffstat (limited to '_pytest/_code/code.py')
| -rw-r--r-- | _pytest/_code/code.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py index 0230c5660..bec236876 100644 --- a/_pytest/_code/code.py +++ b/_pytest/_code/code.py @@ -8,8 +8,6 @@ from _pytest.compat import _PY2, _PY3, PY35, safe_str import py builtin_repr = repr -reprlib = py.builtin._tryimport('repr', 'reprlib') - if _PY3: from traceback import format_exception_only else: @@ -235,7 +233,7 @@ class TracebackEntry(object): except KeyError: return False - if py.builtin.callable(tbh): + if callable(tbh): return tbh(None if self._excinfo is None else self._excinfo()) else: return tbh |