From 60dddb03d05ccf4088242a524e624f61782dd40f Mon Sep 17 00:00:00 2001 From: Todd Leonhardt Date: Sun, 15 Apr 2018 14:26:29 -0700 Subject: Started removing dependency on six Removed all dependency on six other than for six.moves.input Also: - Started removing code branches which were for Python 2 support --- tests/test_transcript.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tests/test_transcript.py') diff --git a/tests/test_transcript.py b/tests/test_transcript.py index a579b04a..311a3f42 100644 --- a/tests/test_transcript.py +++ b/tests/test_transcript.py @@ -33,8 +33,7 @@ class CmdLineApp(Cmd): # Add stuff to settable and/or shortcuts before calling base class initializer self.settable['maxrepeats'] = 'Max number of `--repeat`s allowed' - # Need to use this older form of invoking super class constructor to support Python 2.x and Python 3.x - Cmd.__init__(self, *args, **kwargs) + super().__init__(*args, **kwargs) self.intro = 'This is an intro banner ...' # Configure how arguments are parsed for commands using decorators @@ -267,12 +266,8 @@ def test_transcript(request, capsys, filename, feedback_to_output): expected_start = ".\n----------------------------------------------------------------------\nRan 1 test in" expected_end = "s\n\nOK\n" out, err = capsys.readouterr() - if six.PY3: - assert err.startswith(expected_start) - assert err.endswith(expected_end) - else: - assert err == '' - assert out == '' + assert err.startswith(expected_start) + assert err.endswith(expected_end) @pytest.mark.parametrize('expected, transformed', [ -- cgit v1.2.1