encode Unicode strings only; wrapped a line

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@3645 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 4 insertions, 2 deletions

diff --git a/docutils/docutils/io.py b/docutils/docutils/io.py
index 090231336..3c852e9f0 100644
--- a/docutils/docutils/io.py
+++ b/docutils/docutils/io.py
@@ -144,7 +144,8 @@ class Output(TransformSpec):
         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 @@ class Output(TransformSpec):
                     # 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