[Docutils-checkins] r3645 - trunk/docutils/docutils/io.py

[<go...@us...>]

Author: goodger
Date: 2005-07-03 01:08:35 +0200 (Sun, 03 Jul 2005)
New Revision: 3645

Modified:
   trunk/docutils/docutils/io.py
Log:
encode Unicode strings only; wrapped a line

Modified: trunk/docutils/docutils/io.py
===================================================================
--- trunk/docutils/docutils/io.py	2005-07-01 16:39:51 UTC (rev 3644)
+++ trunk/docutils/docutils/io.py	2005-07-02 23:08:35 UTC (rev 3645)
@@ -144,7 +144,8 @@
         raise NotImplementedError
 
     def encode(self, data):
-        if self.encoding and self.encoding.lower() == 'unicode':
+        if ( self.encoding and self.encoding.lower() == 'unicode'
+             or not isinstance(data, UnicodeType)):
             return data
         else:
             try:
@@ -156,7 +157,8 @@
                     # We are using xmlcharrefreplace with a Python
                     # version that doesn't support it (2.1 or 2.2), so
                     # we emulate its behavior.
-                    return ''.join([self.xmlcharref_encode(char) for char in data])
+                    return ''.join([self.xmlcharref_encode(char)
+                                    for char in data])
                 else:
                     raise