openstack/deb-python-couleur
Code Issues Proposed changes

fixes

Browse Source
This commit is contained in:
Gabriel Falcão
2010-08-11 02:02:18 -03:00
parent 65ccf4dba6
commit f4a256b457
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
couleur.py
View File

@@ -57,9 +57,9 @@ def ignore_colors(string):
up_count_regex = re.compile(ur'[#][{]up[}]')
up_count = len(up_count_regex.findall(string)) or 1
expression = u'([#][{]up[}])+.*(?P<end>\\n.*){%d}' % up_count
up_supress_regex = re.compile(expression, re.DOTALL)
string = up_supress_regex.sub('\g<end>', string)
expression = u'^([#][{]up[}])+(?P<end>.*\\n){%d}' % up_count
up_supress_regex = re.compile(expression, re.MULTILINE)
string = up_supress_regex.sub('', string)
for attr in re.findall("[#][{]on[:](\w+)[}]", string):
string = string.replace("#{on:%s}" % attr, "")

8
test_file_filter.py
View File

@@ -109,8 +109,8 @@ def test_supress_up_when_ignoring_colors():
io = StringIO()
couleur.proxy(io).enable()
couleur.proxy(io).ignore()
io.write("This is visible#{up}but this is invisible\n")
assert_equals('This is visible\n', io.getvalue())
io.write("#{up}but this is invisible\n")
assert_equals('', io.getvalue())
def test_supress_up_when_ignoring_colors_as_many_times_needed():
"file-like filter output: supress #{up} as many times as needed"
@@ -118,9 +118,9 @@ def test_supress_up_when_ignoring_colors_as_many_times_needed():
io = StringIO()
couleur.proxy(io).enable()
couleur.proxy(io).ignore()
io.write("This is visible#{up}#{up}#{up}#{up}\n" \
io.write("#{up}#{up}#{up}#{up}\n" \
" Line one supressed\n" \
" Line two supressed\n" \
" Line three supressed\n")
assert_equals('This is visible\n', io.getvalue())
assert_equals('', io.getvalue())