diff --git a/mercurial/scmposix.py b/mercurial/scmposix.py index 5c379b1f56c706defbb61dbe1b5b18ab46974bae_bWVyY3VyaWFsL3NjbXBvc2l4LnB5..80708959161a2cf7cd72835aceef07f3b7072c72_bWVyY3VyaWFsL3NjbXBvc2l4LnB5 100644 --- a/mercurial/scmposix.py +++ b/mercurial/scmposix.py @@ -1,5 +1,6 @@ from __future__ import absolute_import +import array import errno import fcntl import os @@ -43,5 +44,4 @@ def termwidth(ui): try: - import array import termios @@ -47,4 +47,8 @@ import termios + TIOCGWINSZ = termios.TIOCGWINSZ # unavailable on IRIX (issue3449) + except (AttributeError, ImportError): + return 80 + if True: for dev in (ui.ferr, ui.fout, ui.fin): try: try: @@ -53,8 +57,8 @@ continue if not os.isatty(fd): continue - try: - arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) + if True: + arri = fcntl.ioctl(fd, TIOCGWINSZ, '\0' * 8) width = array.array('h', arri)[1] if width > 0: return width @@ -58,8 +62,6 @@ width = array.array('h', arri)[1] if width > 0: return width - except AttributeError: - pass except ValueError: pass except IOError as e: @@ -67,6 +69,4 @@ pass else: raise - except ImportError: - pass return 80