Changeset 926ece5 in sasview

Timestamp:

Sep 18, 2018 7: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.

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (2 diffs)
• sasgui/guiframe/gui_manager.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:

src/sas/sasgui/guiframe/gui_manager.py

@@ -2425 +2425 @@
                     "CanSAS 1D files (*.xml)|*.xml|"\
                      "NXcanSAS files (*.h5)|*.h5|"
-        options = {0: ".txt",
-                   1: ".xml",
-                   2: ".h5"}
+        options = [".txt", ".xml",".h5"]
         dlg = wx.FileDialog(self, "Choose a file",
                             self._default_save_location,
@@ -2530 +2528 @@
             text += 'dY_min = %s:  dY_max = %s\n' % (min(data.dy), max(data.dy))
         text += '\nData Points:\n'
-        text += "<index> \t<X> \t<Y> \t<dY> \t<dX"
-        if data.dxl is not None and data.dxw is not None:
-                text += "l> \t<dxw"
-        text += ">\n"
+        text += "<index> \t<X> \t<Y> \t<dY> "
+        text += "\t<dX>\n" if(data.dxl is not None and
+                              data.dxw is not None) else "\t<dXl> \t<dXw>\n"
         for index in range(len(data.x)):
             if data.dy is not None and len(data.dy) > index: