From cfc7ab00ea2309ddbca5949a42d433011f3651a6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 20 Jul 2006 01:43:00 +0000 Subject: [PATCH] Handle a potential ValueError when parsing the number of terminal columns. svn path=/main/trunk/; revision=3954 --- pym/output.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pym/output.py b/pym/output.py index ee5a7bf62..f9d4fccb0 100644 --- a/pym/output.py +++ b/pym/output.py @@ -257,11 +257,20 @@ class EOutput: self.__last_e_cmd = "" self.__last_e_len = 0 self.quiet = False - self.term_columns = int(os.getenv("COLUMNS", 0)) - if self.term_columns == 0: - self.term_columns = int(commands.getoutput('set -- `stty size 2>/dev/null` ; echo "$2"')) - if self.term_columns == 0: - self.term_columns = 80 + columns = 0 + try: + columns = int(os.getenv("COLUMNS", 0)) + except ValueError: + pass + if columns <= 0: + try: + columns = int(commands.getoutput( + 'set -- `stty size 2>/dev/null` ; echo "$2"')) + except ValueError: + pass + if columns <= 0: + columns = 80 + self.term_columns = columns def __eend(self, caller, errno, msg): if errno == 0: -- 2.26.2