Changeset e6e89c4 in sasview

Timestamp:

Sep 22, 2017 7:14:38 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:

f7d720f

Parents:

5a6a84e

Message:

exec magic for dereferencing default units didn't work in python 3

File:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (6 diffs)

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

@@ -630 +630 @@
                 else:
                     save_in = "current_datainfo"
-                exec("default_unit = self.{0}.{1}".format(save_in, unitname))
+                default_unit = getattrchain(self, '.'.join((save_in, unitname)))
                 if (local_unit and default_unit
                         and local_unit.lower() != default_unit.lower()
@@ -636 +636 @@
                     if HAS_CONVERTER:
                         # Check local units - bad units raise KeyError
+                        #print("loading", tagname, node_value, local_unit, default_unit)
                         data_conv_q = Converter(local_unit)
                         value_unit = default_unit
@@ -716 +717 @@
         doc, _ = self._to_xml_doc(datainfo)
         # Write the file
-        file_ref = open(filename, 'w')
+        file_ref = open(filename, 'wb')
         if self.encoding is None:
             self.encoding = "UTF-8"
@@ -1283 +1284 @@
             if units is not None:
                 toks = variable.split('.')
-                exec("local_unit = storage.%s_unit" % toks[0])
+                # TODO: why split() when accessing unit, but not when setting value?
+                local_unit = getattr(storage, toks[0]+"_unit")
                 if local_unit is not None and units.lower() != local_unit.lower():
                     if HAS_CONVERTER == True:
                         try:
                             conv = Converter(units)
-                            exec("storage.%s = %g" %
--                                (variable, conv(value, units=local_unit)))
+                            setattrchain(storage, variable, conv(value, units=local_unit))
                         except Exception:
                             _, exc_value, _ = sys.exc_info()
@@ -1310 +1311 @@
                             raise ValueError(err_mess)
                 else:
-                    exec("storage.%s = value" % variable)
+                    setattrchain(storage, variable, value)
             else:
-                exec("storage.%s = value" % variable)
+                setattrchain(storage, variable, value)
 
     # DO NOT REMOVE - used in saving and loading panel states.
@@ -1375 +1376 @@
         return True
     return False
+
+def getattrchain(obj, chain, default=None):
+    """Like getattr, but the attr may contain multiple parts separated by '.'"""
+    for part in chain.split('.'):
+        if hasattr(obj, part):
+            obj = getattr(obj, part, None)
+        else:
+            return default
+    return obj
+
+def setattrchain(obj, chain, value):
+    """Like setattr, but the attr may contain multiple parts separated by '.'"""
+    parts = list(chain.split('.'))
+    for part in parts[-1]:
+        obj = getattr(obj, part, None)
+        if obj is None:
+            raise ValueError("missing parent object "+part)
+    setattr(obj, value)