nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "manage tty colummns while displaying text"

Browse source 
This reverts commit 5852bd5ef9.
This commit is contained in:
Romain Bignon 2015-06-10 21:21:07 +02:00
commit 05d11e4c36
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
weboob/tools/application/formatters/iformatter.py
View file

@ -48,8 +48,7 @@ else:
def readch():
fd = sys.stdin.fileno()
old_settings = termios.tcgetattr(fd)
#tty.setraw(fd)
tty.setcbreak(fd)
tty.setraw(fd)
try:
c = sys.stdin.read(1)
# XXX do not read magic number
@ -112,18 +111,12 @@ class IFormatter(object):
(bufx, bufy, curx, cury, wattr,
left, top, right, bottom, maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw)
self.termrows = right - left + 1
self.termcols = bottom - top + 1
else:
self.termrows = 80 # can't determine actual size - return default values
self.termcols = 80
else:
self.termrows = int(
subprocess.Popen('stty size', shell=True, stdout=subprocess.PIPE).communicate()[0].split()[0]
)
self.termcols = int(
subprocess.Popen('stty size', shell=True, stdout=subprocess.PIPE).communicate()[0].split()[1]
)
def output(self, formatted):
if self.outfile != sys.stdout:
@ -141,10 +134,8 @@ class IFormatter(object):
if isinstance(line, unicode):
line = line.encode(guess_encoding(self.outfile), 'replace')
#self.outfile.write(line)
print(line)
self.print_lines += int(len(line)/self.termcols) + 1
#self.print_lines += 1
self.print_lines += 1
def start_format(self, **kwargs):
pass