Compare commits

...

2 Commits

Author SHA1 Message Date
Philipp Hagemeister
86be82610c release 2015.10.06.1 2015-10-06 17:43:50 +02:00
Philipp Hagemeister
4810c48d6d [compat] Do not compare None <= 0
The result is meaningless (and it emits a warning in cpython2 when called with -3), so handle None before making integer comparisons.
2015-10-06 14:30:43 +02:00
2 changed files with 6 additions and 6 deletions

View File

@@ -417,18 +417,18 @@ else:
_terminal_size = collections.namedtuple('terminal_size', ['columns', 'lines'])
def compat_get_terminal_size(fallback=(80, 24)):
columns = compat_getenv('COLUMNS', None)
columns = compat_getenv('COLUMNS')
if columns:
columns = int(columns)
else:
columns = None
lines = compat_getenv('LINES', None)
lines = compat_getenv('LINES')
if lines:
lines = int(lines)
else:
lines = None
if columns <= 0 or lines <= 0:
if columns is None or lines is None or columns <= 0 or lines <= 0:
try:
sp = subprocess.Popen(
['stty', 'size'],
@@ -438,9 +438,9 @@ else:
except Exception:
_columns, _lines = _terminal_size(*fallback)
if columns <= 0:
if columns is None or columns <= 0:
columns = _columns
if lines <= 0:
if lines is None or lines <= 0:
lines = _lines
return _terminal_size(columns, lines)

View File

@@ -1,3 +1,3 @@
from __future__ import unicode_literals
__version__ = '2015.10.06'
__version__ = '2015.10.06.1'