Changeset 15 for formatflowed

Timestamp:

09/07/05 08:23:50 (7 years ago)

Author:

mj

Message:

convertToWrapped is trying to do too much; just return \n-delimited unicode.

Files:

• formatflowed/trunk/formatflowed.py (modified) (4 diffs)

formatflowed/trunk/formatflowed.py

@@ -672 +672 @@
     return encoder.encode(chunks)
 
-def convertToWrapped(flowed, width=78, quote='>', newline='\n',
-                     encoding='ascii', wrap_fixed=True, **kwargs):
+def convertToWrapped(flowed, width=78, quote=u'>', wrap_fixed=True, **kwargs):
     """Covert flowed text to encoded and wrapped text
     
@@ -682 +681 @@
       width (default: 78)
         The maximum line length at which to wrap paragraphs. 
-      quote (default: '>')
+      quote (default: u'>')
         Character sequence to use to mark quote depths; it is multiplied with
         the quotedepth to quote a line. If this sequence does not end in a
         space a space is added between the quotemars and the line.
-      newline (default: '\n')
-        Lines are joined with the newline character sequence.
-      encoding (default: ascii)
-        Text chunks from the decoded flowed text are encoded to this encoding
       wrap_fixed (default: True)
         If true, fixed text chunks are wrapped to the given  width as well,
@@ -730 +725 @@
         type = info['type']
         quotedepth = info['quotedepth']
-        chunk = chunk.encode(encoding)
-        quotemarker = quotedepth and quote * quotedepth or ''
-        if quotemarker and quote[-1] != ' ':
-            quotemarker += ' '
+        quotemarker = quotedepth and quote * quotedepth or u''
+        if quotemarker and quote[-1] != u' ':
+            quotemarker += u' '
         if type == FIXED and not wrap_fixed:
             result.append(quotemarker + chunk)
@@ -743 +737 @@
                                         initial_indent=quotemarker,
                                         subsequent_indent=quotemarker))
-    return newline.join(result)
+    return u'\n'.join(result)