Changeset 601

Timestamp:

17/04/09 23:24:25 (11 months ago)

Author:

athomas

Message:

Renamed cprintstrip() to cstrip().

Files:

• cly/trunk/cly/console.py (modified) (4 diffs)

cly/trunk/cly/console.py

@@ -35 +35 @@
 
 __all__ = """
-cwrite getch cerror cfatal register_codec cinfo cjustify clen cprint cprintstrip
-csplice cwarning cwraptext print_table rjustify termheight termwidth wraptoterm
+cwrite getch cerror cfatal register_codec cinfo cjustify clen cprint csplice
+cwarning cwraptext print_table rjustify termheight termwidth wraptoterm cstrip
 cencode cdecode
 """.split()
@@ -45 +45 @@
 _decode_re = re.compile(r'\^([N0-7BU])|[^^]+|\^')
 _encode_re = re.compile(r'\033(?:[^[]|$)|\033\[(.*?)m')
-_cprint_strip = re.compile(r'\^([N0-7BU])')
+_cstrip_re = re.compile(r'\^([N0-7BU])')
 _cwrap_re = re.compile(r'(\n)|(\s+)|((?:\^[N0-7BU]|\S)+\b[^\n^\w]*)|(.)')
 _terminal_type = None
@@ -57 +57 @@
 
 def mono_cwrite(io, text):
-    io.write(_cprint_strip.sub('', text))
+    io.write(_cstrip_re.sub('', text))
 
 
@@ -336 +336 @@
 
 
-def cprintstrip(*args):
-    """As with cprint, but strip colour codes."""
-    return _cprint_strip.sub('', ' '.join(map(str, args)))
+def cstrip(text):
+    """Strip colour codes from text."""
+    return _cstrip_re.sub('', text)
 
 
 def clen(arg):
     """Return the length of arg after colour codes are stripped."""
-    return len(cprintstrip(arg))
+    return len(cstrip(arg))