MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-04-19 01:00:42 +01:00
Code Issues Releases Wiki Activity

#682: Fix tests in python 2

Browse Source
This commit is contained in:
Vladimir Iakovlev 2017-08-26 06:20:52 +02:00
parent 31becc9456
commit c4848d1816
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -35,6 +35,7 @@ VERSION = '3.21'
install_requires = ['psutil', 'colorama', 'six', 'decorator', 'pyte'] install_requires = ['psutil', 'colorama', 'six', 'decorator', 'pyte']
extras_require = {':python_version<"3.4"': ['pathlib2'], extras_require = {':python_version<"3.4"': ['pathlib2'],
':python_version<"3.3"': ['backports.shutil_get_terminal_size'],
":sys_platform=='win32'": ['win_unicode_console']} ":sys_platform=='win32'": ['win_unicode_console']}
setup(name='thefuck', setup(name='thefuck',

7
thefuck/output/read_log.py
View File

@ -1,6 +1,9 @@
import os import os
import shlex import shlex
from shutil import get_terminal_size try:
from shutil import get_terminal_size
except ImportError:
from backports.shutil_get_terminal_size import get_terminal_size
from warnings import warn from warnings import warn
import pyte import pyte
from ..exceptions import ScriptNotInLog from ..exceptions import ScriptNotInLog
@ -60,7 +63,7 @@ def get_output(script):
lines = _get_output_lines(script, log_file) lines = _get_output_lines(script, log_file)
output = '\n'.join(lines).strip() output = '\n'.join(lines).strip()
return output, output return output, output
except FileNotFoundError: except OSError:
warn("Can't read output log") warn("Can't read output log")
return None, None return None, None
except ScriptNotInLog: except ScriptNotInLog: