Changeset 7b50f14 in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Sep 22, 2017 7:40:41 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d04ac05

Parents:

46cf4c9

Message:

restore python 2 functionality

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (5 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -6 +6 @@
 
 import os
+import sys
 import re
 import logging
@@ -18 +19 @@
 logger = logging.getLogger(__name__)
 
+if sys.version_info[0] < 3:
+    def decode(s):
+        return s
+else:
+    def decode(s):
+        return s.decode() if isinstance(s, bytes) else s
 
 class FileReader(object):
@@ -85 +92 @@
         """
         #return self.f_open.readline()
-        return self.f_open.readline().decode()
+        return decode(self.f_open.readline())
 
     def nextlines(self):
@@ -93 +100 @@
         for line in self.f_open:
             #yield line
-            yield line.decode()
+            yield decode(line)
 
     def readall(self):
@@ -100 +107 @@
         """
         #return self.f_open.read()
-        return self.f_open.read().decode()
+        return decode(self.f_open.read())
 
     def handle_error_message(self, msg):