Remove TerminalWriter hack for counting chars

Author: nicoddemus

_pytest/terminal.py

@@ -147,8 +147,6 @@ def __init__(self, config, file=None):
         self.reportchars = getreportopt(config)
         self.hasmarkup = self.writer.hasmarkup
         self.isatty = file.isatty()
-        self._current_line_chars = 0
-        self._install_line_chars_tracker()
         self._progress_items_reported = 0
 
     @property
@@ -161,28 +159,6 @@ def _tw(self):
                       stacklevel=2)
         return self.writer
 
-    @staticmethod
-    def _new_tw_write(msg, **kw):
-        terminal_reporter = kw.pop('_terminal_reporter')
-        original_write = kw.pop('_original_write')
-        fields = msg.rsplit('\n', 1)
-        if '\n' in msg:
-            terminal_reporter._current_line_chars = len(fields[-1])
-        else:
-            terminal_reporter._current_line_chars += len(fields[-1])
-        original_write(msg, **kw)
-
-    def _install_line_chars_tracker(self):
-        """
-
-        :return:
-        """
-        import functools
-        import weakref
-        self.writer.write = functools.partial(self._new_tw_write,
-                                              _terminal_reporter=weakref.proxy(self),
-                                              _original_write=self.writer.write)
-
     def hasopt(self, char):
         char = {'xfailed': 'x', 'skipped': 's'}.get(char, char)
         return char in self.reportchars
@@ -329,7 +305,7 @@ def _maybe_write_progress_information(self):
             self._write_progress_information_filling_space()
             return
 
-        past_right_side = self._current_line_chars + self._PROGRESS_LENGTH + 1 >= self._screen_width
+        past_right_side = self.writer.chars_on_current_line + self._PROGRESS_LENGTH + 1 >= self._screen_width
         if past_right_side:
             msg = self._get_progress_information_message()
             self.writer.line(msg)
@@ -342,7 +318,7 @@ def _get_progress_information_message(self):
 
     def _write_progress_information_filling_space(self):
         msg = self._get_progress_information_message()
-        fill = ' ' * (self.writer.fullwidth - self._current_line_chars - len(msg) - 1)
+        fill = ' ' * (self.writer.fullwidth - self.writer.chars_on_current_line - len(msg) - 1)
         self.write(fill + msg)
 
     def pytest_collection(self):

testing/test_terminal.py

@@ -964,43 +964,3 @@ def test_no_trailing_whitespace_after_inifile_word(testdir):
     testdir.makeini('[pytest]')
     result = testdir.runpytest('')
     assert 'inifile: tox.ini\n' in result.stdout.str()
-
-
-def test_new_tw_write():
-    """ DOCUMENT ME"""
-    class Dummy:
-
-        def __init__(self):
-            self._current_line_chars = 0
-
-        def write(self, *args, **kwargs):
-            self.args = args
-            self.kwargs = kwargs
-
-    dummy = Dummy()
-
-    def write_and_check(s, expected):
-        TerminalReporter._new_tw_write(s, _terminal_reporter=dummy, _original_write=dummy.write, bold=True)
-        assert dummy._current_line_chars == expected
-        assert dummy.args == (s,)
-        assert dummy.kwargs == {'bold': True}
-
-    write_and_check('foo', 3)
-    write_and_check('bar', 6)
-    write_and_check('\n', 0)
-    write_and_check('\n', 0)
-    write_and_check('\n\n\n', 0)
-    write_and_check('\nfoo', 3)
-    write_and_check('\nfbar\nhello', 5)
-
-
-def test_write_updates_line_chars_count(testdir):
-    config = testdir.parseconfig()
-    f = py.io.TextIO()
-    tr = TerminalReporter(config, file=f)
-    assert tr._current_line_chars == 0
-    tr.write('foo')
-    assert tr._current_line_chars == 3
-    tr.line('bar')
-    assert tr._current_line_chars == 0
-    assert f.getvalue() == 'foobar\n'