p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move code to get width of current line to a function

This commit is contained in:
Bruno Oliveira 2018-08-30 21:16:35 -03:00
parent c18a5b5179
commit 96aad2983b
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -59,7 +59,7 @@ def get_environment_marker_support_level():
def main(): def main():
extras_require = {} extras_require = {}
install_requires = [ install_requires = [
"py>=1.5.0", "py>=1.5.0", # if py gets upgrade to >=1.6, remove _width_of_current_line in terminal.py
"six>=1.10.0", "six>=1.10.0",
"setuptools", "setuptools",
"attrs>=17.4.0", "attrs>=17.4.0",

21
src/_pytest/terminal.py
View File

@ -412,11 +412,7 @@ class TerminalReporter(object):
if last_item: if last_item:
self._write_progress_information_filling_space() self._write_progress_information_filling_space()
else: else:
try: w = self._width_of_current_line
w = self._tw.width_of_current_line
except AttributeError:
# py < 1.6.0
w = self._tw.chars_on_current_line
past_edge = w + self._PROGRESS_LENGTH + 1 >= self._screen_width past_edge = w + self._PROGRESS_LENGTH + 1 >= self._screen_width
if past_edge: if past_edge:
msg = self._get_progress_information_message() msg = self._get_progress_information_message()
@ -435,14 +431,19 @@ class TerminalReporter(object):
def _write_progress_information_filling_space(self): def _write_progress_information_filling_space(self):
msg = self._get_progress_information_message() msg = self._get_progress_information_message()
try: w = self._width_of_current_line
w = self._tw.width_of_current_line
except AttributeError:
# py < 1.6.0
w = self._tw.chars_on_current_line
fill = self._tw.fullwidth - w - 1 fill = self._tw.fullwidth - w - 1
self.write(msg.rjust(fill), cyan=True) self.write(msg.rjust(fill), cyan=True)
@property
def _width_of_current_line(self):
"""Return the width of current line, using the superior implementation of py-1.6 when available"""
try:
return self._tw.width_of_current_line
except AttributeError:
# py < 1.6.0
return self._tw.chars_on_current_line
def pytest_collection(self): def pytest_collection(self):
if not self.isatty and self.config.option.verbose >= 1: if not self.isatty and self.config.option.verbose >= 1:
self.write("collecting ... ", bold=True) self.write("collecting ... ", bold=True)