Changeset 7b50f14 in sasview

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

Files:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (5 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (3 diffs)
• src/sas/sascalc/dataloader/readers/xml_reader.py (modified) (2 diffs)
• test/sasdataloader/test/utest_cansas.py (modified) (1 diff)

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):

src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

@@ -9 +9 @@
 import sys
 
-from sas.sascalc.dataloader.data_info import plottable_1D, plottable_2D,\
+from ..data_info import plottable_1D, plottable_2D,\
     Data1D, Data2D, DataInfo, Process, Aperture, Collimation, \
     TransmissionSpectrum, Detector
-from sas.sascalc.dataloader.data_info import combine_data_info_with_plottable
-from sas.sascalc.dataloader.loader_exceptions import FileContentsException, DefaultReaderException
-from sas.sascalc.dataloader.file_reader_base_class import FileReader
-
-def decode(s):
-    return s.decode() if isinstance(s, bytes) else s
+from ..data_info import combine_data_info_with_plottable
+from ..loader_exceptions import FileContentsException, DefaultReaderException
+from ..file_reader_base_class import FileReader, decode
 
 def h5attr(node, key, default=None):
@@ -135 +132 @@
             # Get all information for the current key
             value = data.get(key)
-            classname = h5attr(value, u'canSAS_class')
-            if classname is None:
+            class_name = h5attr(value, u'canSAS_class')
+            if class_name is None:
                 class_name = h5attr(value, u'NX_class')
             if class_name is not None:
@@ -240 +237 @@
                             run_dict = {data_point: run_name}
                             self.current_datainfo.run_name = run_dict
-                        except:
+                        except Exception:
                             pass
                     elif key == u'title':

src/sas/sascalc/dataloader/readers/xml_reader.py

@@ -20 +20 @@
 from lxml.builder import E
 
-from sas.sascalc.dataloader.file_reader_base_class import FileReader
+from ..file_reader_base_class import FileReader, decode
 
 logger = logging.getLogger(__name__)
@@ -153 +153 @@
         Converts an etree element into a string
         """
-        return etree.tostring(elem, pretty_print=pretty_print,
-                              encoding=encoding).decode()
+        return decode(etree.tostring(elem, pretty_print=pretty_print,
+                                     encoding=encoding))
 
     def break_processing_instructions(self, string, dic):

test/sasdataloader/test/utest_cansas.py

@@ -4 +4 @@
 import os
 import sys
-from io import StringIO
 import unittest
 import logging
 import warnings
+if sys.version_info[0] >= 3:
+    from io import StringIO
+else:
+    from StringIO import StringIO
 
 from lxml import etree