nojhan/colout
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of http://github.com/nojhan/colout

Browse source
This commit is contained in:
Johann Dreo 2013-06-10 10:53:22 +02:00
commit c834c84e25
2 changed files with 54 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

22
colout/colout.py
View file

@ -267,6 +267,7 @@ def colorin(text, color="red", style="normal"):
assert( type(color) is str )
global colormap_idx
global debug
# Special characters.
start = "\033["
@ -284,7 +285,10 @@ def colorin(text, color="red", style="normal"):
if color == "none":
# if no color, style cannot be applied
return text
if not debug:
return text
else:
return "<none>"+text+"</none>"
elif color == "random":
mode = 8
@ -396,13 +400,19 @@ def colorin(text, color="red", style="normal"):
formatter = TerminalFormatter(bg=style)
# We should return all but the last character,
# because Pygments adds a newline char.
return highlight(text, lexer, formatter)[:-1]
if not debug:
return highlight(text, lexer, formatter)[:-1]
else:
return "<"+color+">"+ highlight(text, lexer, formatter)[:-1] + "</"+color+">"
# unrecognized
else:
raise UnknownColor(color)
return start + style_code + endmarks[mode] + color_code + "m" + text + stop
if not debug:
return start + style_code + endmarks[mode] + color_code + "m" + text + stop
else:
return start + style_code + endmarks[mode] + color_code + "m<" + color + ">" + text + "</" + color + ">" + stop
def colorout(text, match, prev_end, color="red", style="normal", group=0):
@ -442,7 +452,11 @@ def colorup(text, pattern, color="red", style="normal", on_groups=False):
'\x1b[1;34mF\x1b[0m\x1b[3;34maites\x1b[0m \x1b[1;34mC\x1b[0m\x1b[3;34mhier\x1b[0m la Vache'
"""
global colormap_idx
regex = re.compile(pattern) # , re.IGNORECASE)
if not debug:
regex = re.compile(pattern)
else:
regex = re.compile(pattern, re.DEBUG)
# Prepare the colored text.
colored_text = ""