fix tox tests for Python 3.5 (swift-nav#853) #no_auto_pr

* fix tox tests for Python 3.5

* use a helper to decrease nesting

Author: Jason Mobarak

generator/setup.py

@@ -11,7 +11,7 @@
 
 setup(name='sbp_gen',
       description='Generator for Swift Binary Protocol',
-      long_description=open('README.md').read(),
+      long_description=open('README.md', 'rb').read().decode('utf8'),
       version='0.10',
       author='Swift Navigation',
       author_email='[email protected]',

python/sbp/client/loggers/json_logger.py

@@ -134,6 +134,7 @@ def _next_conventional(self):
         if self._broken:
             raise StopIteration
 
+        line = ''
         try:
             line = self.handle.readline()
 
@@ -147,13 +148,22 @@ def _next_conventional(self):
             # Try next line, can lead to RecursionError if source is full of rubbish
             return self._next_conventional()
 
-    def _next_legacy(self):
+    def _next_legacy_inner(self):
+        line = ''
         for line in self.handle:
             try:
                 yield self._extract_data(line)
             except (ValueError, UnicodeDecodeError):
-                warn = "Bad JSON decoding for line %s" % line
+                warn = "Bad JSON decoding for line %s" % (line,)
                 warnings.warn(warn, RuntimeWarning)
+
+    def _next_legacy(self):
+        try:
+            for line in self._next_legacy_inner():
+                yield line
+        except (ValueError, UnicodeDecodeError):
+            warn = "Bad JSON decoding"
+            warnings.warn(warn, RuntimeWarning)
         self.handle.seek(0, 0)
 
     def __next__(self):

python/setup.py

@@ -163,8 +163,8 @@ def exclude_jit_libs(lib):
 
 if __name__ == "__main__":
 
-    with open(os.path.join(setup_py_dir, 'README.rst')) as f:
-        readme = f.read()
+    with open(os.path.join(setup_py_dir, 'README.rst'), 'rb') as f:
+        readme = f.read().decode('utf8')
 
     write_version_py()