maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lit] Fix a couple lingering Py3 compat issues in ProgressBar. 

llvm-svn: 188951
This commit is contained in:
Daniel Dunbar 2013-08-21 22:26:47 +00:00
parent be791650f8
commit 39be0b4b4c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/utils/lit/lit/ProgressBar.py
View File

@ -5,6 +5,10 @@
import sys, re, time import sys, re, time
def to_bytes(str):
# Encode to Latin1 to get binary data.
return str.encode('ISO-8859-1')
class TerminalController: class TerminalController:
""" """
A class that can be used to portably generate formatted output to A class that can be used to portably generate formatted output to
@ -116,19 +120,23 @@ class TerminalController:
set_fg = self._tigetstr('setf') set_fg = self._tigetstr('setf')
if set_fg: if set_fg:
for i,color in zip(range(len(self._COLORS)), self._COLORS): for i,color in zip(range(len(self._COLORS)), self._COLORS):
setattr(self, color, curses.tparm(set_fg, i) or '') setattr(self, color, self._tparm(set_fg, i))
set_fg_ansi = self._tigetstr('setaf') set_fg_ansi = self._tigetstr('setaf')
if set_fg_ansi: if set_fg_ansi:
for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS): for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
setattr(self, color, curses.tparm(set_fg_ansi, i) or '') setattr(self, color, self._tparm(set_fg_ansi, i))
set_bg = self._tigetstr('setb') set_bg = self._tigetstr('setb')
if set_bg: if set_bg:
for i,color in zip(range(len(self._COLORS)), self._COLORS): for i,color in zip(range(len(self._COLORS)), self._COLORS):
setattr(self, 'BG_'+color, curses.tparm(set_bg, i) or '') setattr(self, 'BG_'+color, self._tparm(set_bg, i))
set_bg_ansi = self._tigetstr('setab') set_bg_ansi = self._tigetstr('setab')
if set_bg_ansi: if set_bg_ansi:
for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS): for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
setattr(self, 'BG_'+color, curses.tparm(set_bg_ansi, i) or '') setattr(self, 'BG_'+color, self._tparm(set_bg_ansi, i))
def _tparm(self, arg, index):
import curses
return curses.tparm(to_bytes(arg), index).decode('ascii') or ''
def _tigetstr(self, cap_name): def _tigetstr(self, cap_name):
# String capabilities can include "delays" of the form "$<2>". # String capabilities can include "delays" of the form "$<2>".