chiark / gitweb /
Undo utf-8 text wrap workaround
authorDaniel Martí <mvdan@mvdan.cc>
Sun, 10 Jan 2016 17:35:06 +0000 (18:35 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Fri, 11 Mar 2016 13:27:00 +0000 (13:27 +0000)
This was added to fix unicode support in Python2. No longer needed in
Python3.

fdroidserver/metadata.py

index ff0ef2e515b1a8976418876e07f116fca3399d3f..5a5d9d2db51539aae07f0217f5846c8098af4919 100644 (file)
@@ -530,10 +530,10 @@ class DescriptionFormatter:
         self.state = self.stNONE
         whole_para = ' '.join(self.para_lines)
         self.addtext(whole_para)
-        wrapped = textwrap.fill(whole_para.decode('utf-8'), 80,
+        wrapped = textwrap.fill(whole_para, 80,
                                 break_long_words=False,
                                 break_on_hyphens=False)
-        self.text.write(wrapped.encode('utf-8'))
+        self.text.write(wrapped)
         self.html.write('</p>')
         del self.para_lines[:]