Fixed txt storage tests on Python 3

translate/storage/test_txt.py

@@ -19,7 +19,7 @@ def txtparse(self, txtsource):
 
     def txtregen(self, txtsource):
         """helper that converts txt source to txtfile object and back"""
-        return self.txtparse(txtsource).serialize()
+        return self.txtparse(txtsource).serialize().decode('utf-8')
 
     def test_simpleblock(self):
         """checks that a simple txt block is parsed correctly"""
@@ -37,5 +37,5 @@ def test_multipleblocks(self):
         print(txtsource)
         print(txtfile.serialize())
         print("*%s*" % txtfile.units[0])
-        assert txtfile.serialize() == txtsource
+        assert txtfile.serialize().decode('utf-8') == txtsource
         assert self.txtregen(txtsource) == txtsource

translate/storage/txt.py

@@ -114,9 +114,9 @@ def parse(self, lines):
         pretext = ""
         posttext = ""
         if not isinstance(lines, list):
-            lines = lines.split("\n")
-        for linenum in range(len(lines)):
-            line = lines[linenum].rstrip("\r\n")
+            lines = lines.split(b"\n")
+        for linenum, line in enumerate(lines):
+            line = line.decode(self.encoding).rstrip("\r\n")
             for rule, prere, postre in self.flavour:
                 match = prere.match(line)
                 if match: