From 523f54742b8d38ced03ad3d37ef3a061f8c6e544 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 13 Apr 2021 13:55:03 -0400 Subject: [PATCH] RF: no PY2 - remove use of sys.version_info (six is still "in use") --- duecredit/injections/injector.py | 5 +---- duecredit/tests/test_cmdline.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/duecredit/injections/injector.py b/duecredit/injections/injector.py index de153fb..b1e7665 100644 --- a/duecredit/injections/injector.py +++ b/duecredit/injections/injector.py @@ -21,10 +21,7 @@ from ..log import lgr from six import iteritems -if sys.version_info < (3,): - import __builtin__ -else: - import builtins as __builtin__ +import builtins as __builtin__ __all__ = ['DueCreditInjector', 'find_object'] diff --git a/duecredit/tests/test_cmdline.py b/duecredit/tests/test_cmdline.py index f41b14c..e047791 100644 --- a/duecredit/tests/test_cmdline.py +++ b/duecredit/tests/test_cmdline.py @@ -33,7 +33,7 @@ def test_main_help(monkeypatch): def test_main_version(monkeypatch): # Patch stdout or stderr for different Python versions -- catching both fakestdout = StringIO() - fakeout = 'std' + ('err' if sys.version_info < (3, 4) else 'out') + fakeout = 'stdout' monkeypatch.setattr(sys, fakeout, fakestdout) pytest.raises(SystemExit, main.main, ['--version'])