Merge pull request #12 from Turbo87/encoding

Fixed encoding issues

aerofiles/flarmcfg/writer.py

@@ -48,7 +48,7 @@ def format_longitude(self, value):
             value, default='00000000E', is_latitude=False)
 
     def write_line(self, line):
-        self.fp.write(line + '\r\n')
+        self.fp.write((line + u'\r\n').encode('ascii', 'replace'))
 
     def write_config(self, key, value):
         self.write_line('$PFLAC,S,%s,%s' % (key, value))

aerofiles/igc/writer.py

@@ -80,7 +80,7 @@ def format_longitude(self, value):
             value, default='00000000E', is_latitude=False)
 
     def write_line(self, line):
-        self.fp.write(line + '\r\n')
+        self.fp.write((line + u'\r\n').encode('ascii', 'replace'))
 
     def write_record(self, type, record):
         self.write_line(type + record)

aerofiles/seeyou/writer.py

@@ -22,8 +22,9 @@ class Writer:
     ANGLE_FORMAT_INT = u'%d'
     ANGLE_FORMAT_OTHER = u'%s'
 
-    def __init__(self, fp):
+    def __init__(self, fp, encoding='utf-8'):
         self.fp = fp
+        self.encoding = encoding
         self.wps = set()
         self.in_task_section = False
 
@@ -107,7 +108,7 @@ def format_timedelta(self, timedelta):
         return timedelta
 
     def write_line(self, line=u''):
-        self.fp.write(line + u'\r\n')
+        self.fp.write((line + u'\r\n').encode(self.encoding))
 
     def write_fields(self, fields):
         self.write_line(u','.join(fields))

aerofiles/xcsoar/writer.py

@@ -16,13 +16,14 @@ class Writer:
     :meth:`~aerofiles.xcsoar.Writer.write_task` method.
     """
 
-    def __init__(self, fp=None):
+    def __init__(self, fp, encoding='utf-8'):
         self.fp = fp
+        self.encoding = encoding
         self.indent_level = 0
 
     def write_line(self, line):
         indent = '\t' * self.indent_level
-        self.fp.write(indent + line + '\n')
+        self.fp.write((indent + line + '\n').encode(self.encoding))
 
     def format_tag_content(self, _name, **kw):
         params = list(map(lambda item: '%s="%s"' % item, kw.items()))

tests/flarmcfg/test_writer.py

@@ -1,16 +1,15 @@
+# -*- coding: utf-8 -*-
+
 import pytest
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from io import BytesIO
 
 from aerofiles.flarmcfg import Writer
 
 
 @pytest.fixture()
 def output():
-    return StringIO()
+    return BytesIO()
 
 
 @pytest.fixture()
@@ -20,57 +19,57 @@ def writer(output):
 
 def test_write_line(writer):
     writer.write_line('line')
-    assert writer.fp.getvalue() == 'line\r\n'
+    assert writer.fp.getvalue() == b'line\r\n'
 
 
 def test_write_config(writer):
     writer.write_config('ID', '4B3E60')
-    assert writer.fp.getvalue() == '$PFLAC,S,ID,4B3E60\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,ID,4B3E60\r\n'
 
 
 def test_write_pilot(writer):
     writer.write_pilot('FTV Spandau')
-    assert writer.fp.getvalue() == '$PFLAC,S,PILOT,FTV Spandau\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,PILOT,FTV Spandau\r\n'
 
 
 def test_write_copilot(writer):
     writer.write_copilot('John Doe')
-    assert writer.fp.getvalue() == '$PFLAC,S,COPIL,John Doe\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,COPIL,John Doe\r\n'
 
 
 def test_write_glider_type(writer):
     writer.write_glider_type('Astir CS')
-    assert writer.fp.getvalue() == '$PFLAC,S,GLIDERTYPE,Astir CS\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,GLIDERTYPE,Astir CS\r\n'
 
 
 def test_write_glider_id(writer):
     writer.write_glider_id('D-8551')
-    assert writer.fp.getvalue() == '$PFLAC,S,GLIDERID,D-8551\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,GLIDERID,D-8551\r\n'
 
 
 def test_write_competition_id(writer):
     writer.write_competition_id('75')
-    assert writer.fp.getvalue() == '$PFLAC,S,COMPID,75\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,COMPID,75\r\n'
 
 
 def test_write_competition_class(writer):
     writer.write_competition_class('Club')
-    assert writer.fp.getvalue() == '$PFLAC,S,COMPCLASS,Club\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,COMPCLASS,Club\r\n'
 
 
 def test_write_logger_interval(writer):
     writer.write_logger_interval(4)
-    assert writer.fp.getvalue() == '$PFLAC,S,LOGINT,4\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,LOGINT,4\r\n'
 
 
 def test_write_task_declaration(writer):
     writer.write_task_declaration('My Task')
-    assert writer.fp.getvalue() == '$PFLAC,S,NEWTASK,My Task\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,NEWTASK,My Task\r\n'
 
 
 def test_write_default_task_declaration(writer):
     writer.write_task_declaration()
-    assert writer.fp.getvalue() == '$PFLAC,S,NEWTASK,\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,NEWTASK,\r\n'
 
 
 def test_waypoint(writer):
@@ -80,7 +79,7 @@ def test_waypoint(writer):
         description='Meiersberg',
     )
     assert writer.fp.getvalue() == \
-        '$PFLAC,S,ADDWP,5107345N,00624765E,Meiersberg\r\n'
+        b'$PFLAC,S,ADDWP,5107345N,00624765E,Meiersberg\r\n'
 
 
 def test_waypoint_with_negative_coordinates(writer):
@@ -90,12 +89,12 @@ def test_waypoint_with_negative_coordinates(writer):
         description='TAKEOFF',
     )
     assert writer.fp.getvalue() == \
-        '$PFLAC,S,ADDWP,1232112S,17800001W,TAKEOFF\r\n'
+        b'$PFLAC,S,ADDWP,1232112S,17800001W,TAKEOFF\r\n'
 
 
 def test_default_waypoint(writer):
     writer.write_waypoint()
-    assert writer.fp.getvalue() == '$PFLAC,S,ADDWP,0000000N,00000000E,\r\n'
+    assert writer.fp.getvalue() == b'$PFLAC,S,ADDWP,0000000N,00000000E,\r\n'
 
 
 def test_waypoints(writer):
@@ -108,14 +107,14 @@ def test_waypoints(writer):
         (None, None, 'LANDING'),
     ])
 
-    assert writer.fp.getvalue() == '\r\n'.join([
-        '$PFLAC,S,ADDWP,0000000N,00000000E,TAKEOFF',
-        '$PFLAC,S,ADDWP,5124225N,00624765E,START',
-        '$PFLAC,S,ADDWP,5022926N,00849263E,TURN 1',
-        '$PFLAC,S,ADDWP,5035427N,00702133E,TURN 2',
-        '$PFLAC,S,ADDWP,5124225N,00624765E,FINISH',
-        '$PFLAC,S,ADDWP,0000000N,00000000E,LANDING',
-    ]) + '\r\n'
+    assert writer.fp.getvalue() == b'\r\n'.join([
+        b'$PFLAC,S,ADDWP,0000000N,00000000E,TAKEOFF',
+        b'$PFLAC,S,ADDWP,5124225N,00624765E,START',
+        b'$PFLAC,S,ADDWP,5022926N,00849263E,TURN 1',
+        b'$PFLAC,S,ADDWP,5035427N,00702133E,TURN 2',
+        b'$PFLAC,S,ADDWP,5124225N,00624765E,FINISH',
+        b'$PFLAC,S,ADDWP,0000000N,00000000E,LANDING',
+    ]) + b'\r\n'
 
 
 def test_invalid_waypoints(writer):