summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-01-25 13:42:17 +0000
committermilde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2013-01-25 13:42:17 +0000
commita04fdc47dfbe66053046e7795b397916332b0ca9 (patch)
tree11643b87c0301aa5e934f71bc52bb178c7ecbcf1
parentd1fc1cefa9918397d780f8a2afe8b28b691a83ed (diff)
downloaddocutils-a04fdc47dfbe66053046e7795b397916332b0ca9.tar.gz
Fix TypeError: Python 3 does no implicit conversion between bytes and unicode string.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7596 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docutils/io.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docutils/io.py b/docutils/io.py
index 80dced637..4e526302d 100644
--- a/docutils/io.py
+++ b/docutils/io.py
@@ -369,9 +369,9 @@ class FileOutput(Output):
if ('b' not in self.mode and sys.version_info < (3,0)
or check_encoding(self.destination, self.encoding) is False
):
- data = self.encode(data)
if sys.version_info >= (3,0) and os.linesep != '\n':
data = data.replace('\n', os.linesep) # fix endings
+ data = self.encode(data)
try: # In Python < 2.5, try...except has to be nested in try...finally.
try: