Remove wrap and associated functions from roundup.support

The wrap function duplicates functionality that is already provided by
the inbuilt textwrap module since python v2.3. The wrap function is only
used in one place so lets just replace it with the equivalent in-built
function.

Author: jerrykan

roundup/cgi/templating.py

@@ -21,7 +21,8 @@
 
 
 import cgi, urllib, re, os.path, mimetypes, csv
-import calendar, textwrap
+import calendar
+import textwrap
 
 from roundup import hyperdb, date, support
 from roundup import i18n
@@ -1426,7 +1427,7 @@ def wrapped(self, escape=1, hyperlink=1):
 
         if self._value is None:
             return ''
-        s = support.wrap(str(self._value), width=80)
+        s = '\n'.join(textwrap.wrap(str(self._value), 80))
         if escape:
             s = cgi.escape(s)
         if hyperlink:

roundup/support.py

@@ -118,97 +118,4 @@ def display(self):
         sys.stdout.write(s + ' '*(75-len(s)) + '\r')
         sys.stdout.flush()
 
-LEFT = 'left'
-LEFTN = 'left no strip'
-RIGHT = 'right'
-CENTER = 'center'
-
-def align(line, width=70, alignment=LEFTN):
-    ''' Code from http://www.faqts.com/knowledge_base/view.phtml/aid/4476 '''
-    if alignment == CENTER:
-        line = line.strip()
-        space = width - len(line)
-        return ' '*(space/2) + line + ' '*(space/2 + space%2)
-    elif alignment == RIGHT:
-        line = line.rstrip()
-        space = width - len(line)
-        return ' '*space + line
-    else:
-        if alignment == LEFT:
-            line = line.lstrip()
-        space = width - len(line)
-        return line + ' '*space
-
-
-def format_line(columns, positions, contents, spacer=' | ',
-        collapse_whitespace=True, wsre=re.compile(r'\s+')):
-    ''' Fill up a single row with data from the contents '''
-    l = []
-    data = 0
-    for i in range(len(columns)):
-        width, alignment = columns[i]
-        content = contents[i]
-        col = ''
-        while positions[i] < len(content):
-            word = content[positions[i]]
-            # if we hit a newline, honor it
-            if '\n' in word:
-                # chomp
-                positions[i] += 1
-                break
-
-            # make sure this word fits
-            if col and len(word) + len(col) > width:
-                break
-
-            # no whitespace at start-of-line
-            if collapse_whitespace and wsre.match(word) and not col:
-                # chomp
-                positions[i] += 1
-                continue
-
-            col += word
-            # chomp
-            positions[i] += 1
-        if col:
-            data = 1
-        col = align(col, width, alignment)
-        l.append(col)
-
-    if not data:
-        return ''
-    return spacer.join(l).rstrip()
-
-
-def format_columns(columns, contents, spacer=' | ', collapse_whitespace=True,
-        splitre=re.compile(r'(\n|\r\n|\r|[ \t]+|\S+)')):
-    ''' Format the contents into columns, with 'spacing' between the
-        columns
-    '''
-    assert len(columns) == len(contents), \
-        'columns and contents must be same length'
-
-    # split the text into words, spaces/tabs and newlines
-    for i in range(len(contents)):
-        contents[i] = splitre.findall(contents[i])
-
-    # now process line by line
-    l = []
-    positions = [0]*len(contents)
-    while 1:
-        l.append(format_line(columns, positions, contents, spacer,
-            collapse_whitespace))
-
-        # are we done?
-        for i in range(len(contents)):
-            if positions[i] < len(contents[i]):
-                break
-        else:
-            break
-    return '\n'.join(l)
-
-def wrap(text, width=75, alignment=LEFTN):
-    return format_columns(((width, alignment),), [text],
-        collapse_whitespace=False)
-
 # vim: set et sts=4 sw=4 :