Changeset 926ece5 in sasview for src/sas/sascalc/dataloader

Timestamp:

Sep 18, 2018 9:36:59 AM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

5218180

Parents:

f4e2f22

Message:

Py3 compatibility and code cleanup.

File:

• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (2 diffs)

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

@@ -601 +601 @@
             iter(iterable)
             if (not isinstance(iterable, np.ndarray) and not isinstance(
-                    iterable, list)) or (isinstance(iterable, str) or
-                                         isinstance(iterable, unicode)):
+                    iterable, list)) or (isinstance(iterable, basestring)):
                 raise TypeError
         except TypeError:
@@ -633 +632 @@
                 elif q_vals.attrs.get("uncertainty") is not None:
                     self.q_uncertainties = q_vals.attrs.get("uncertainty")
-                if isinstance(self.q_uncertainties, str):
+                if isinstance(self.q_uncertainties, basestring):
                     self.q_uncertainties = self.q_uncertainties.split(",")
                 if q_vals.attrs.get("resolutions") is not None:
                     self.q_resolutions = q_vals.attrs.get("resolutions")
-                if isinstance(self.q_resolutions, (str, unicode)):
+                if isinstance(self.q_resolutions, basestring):
                     self.q_resolutions = self.q_resolutions.split(",")
         if self.i_name in keys: