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

try to be backwards compat

This commit is contained in:
wim glenn 2018-08-30 19:06:20 -05:00
parent ed4b94a180
commit c18a5b5179
No known key found for this signature in database
GPG Key ID: C127F552CFFFC6DE
2 changed files with 13 additions and 6 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.6.0", "py>=1.5.0",
"six>=1.10.0", "six>=1.10.0",
"setuptools", "setuptools",
"attrs>=17.4.0", "attrs>=17.4.0",

17
src/_pytest/terminal.py
View File

@ -412,10 +412,12 @@ class TerminalReporter(object):
if last_item: if last_item:
self._write_progress_information_filling_space() self._write_progress_information_filling_space()
else: else:
past_edge = ( try:
self._tw.width_of_current_line + self._PROGRESS_LENGTH + 1 w = self._tw.width_of_current_line
>= self._screen_width except AttributeError:
) # py < 1.6.0
w = self._tw.chars_on_current_line
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()
self._tw.write(msg + "\n", cyan=True) self._tw.write(msg + "\n", cyan=True)
@ -433,7 +435,12 @@ 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()
fill = self._tw.fullwidth - self._tw.width_of_current_line - 1 try:
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
self.write(msg.rjust(fill), cyan=True) self.write(msg.rjust(fill), cyan=True)
def pytest_collection(self): def pytest_collection(self):