Changeset 5251ec6 in sasview for src/sas/sasgui/guiframe/data_panel.py

Timestamp:

Oct 11, 2018 12:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/guiframe/data_panel.py (modified) (12 diffs)

src/sas/sasgui/guiframe/data_panel.py

@@ -13 +13 @@
 from __future__ import print_function
 
+import sys
+
 import wx
-from wx.build import build_options
-
-import sys
 from wx.lib.scrolledpanel import ScrolledPanel
 import wx.lib.agw.customtreectrl as CT
+#from wx.build import build_options
+
 from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.sasgui.guiframe.dataFitting import Data2D
@@ -444 +445 @@
             self.parent.get_data_manager().get_by_id(id_list=[id])
         if data_list:
-            data = data_list.values()[0]
+            data = list(data_list.values())[0]
         if data is None:
-            data = theory_list.values()[0][0]
+            data = list(theory_list.values())[0][0]
         return data
 
@@ -667 +668 @@
         """
         if list:
-            for state_id, dstate in list.iteritems():
+            for state_id, dstate in list.items():
                 data = dstate.get_data()
                 theory_list = dstate.get_theory()
@@ -764 +765 @@
         if not theory_list:
             return
-        if state_id not in self.list_cb_data.keys():
+        if state_id not in self.list_cb_data:
             root = self.tree_ctrl_theory.root
             tree = self.tree_ctrl_theory
@@ -783 +784 @@
         Append theory helper
         """
-        if state_id in self.list_cb_theory.keys():
+        if state_id in self.list_cb_theory:
             # update current list of theory for this data
             theory_list_ctrl = self.list_cb_theory[state_id]
 
-            for theory_id, item in theory_list.iteritems():
+            for theory_id, item in theory_list.items():
                 theory_data, _ = item
                 if theory_data is None:
@@ -828 +829 @@
             # data didn't have a theory associated it before
             theory_list_ctrl = {}
-            for theory_id, item in theory_list.iteritems():
+            for theory_id, item in theory_list.items():
                 theory_data, _ = item
                 if theory_data is not None:
@@ -868 +869 @@
 
         for theory_dict in self.list_cb_theory.values():
-            for _, value in theory_dict.iteritems():
+            for _, value in theory_dict.items():
                 item, _, _ = value
                 if item.IsChecked():
@@ -924 +925 @@
         theory_key = []
         # remove  data from treectrl
-        for d_key, item in self.list_cb_data.iteritems():
+        for d_key, item in self.list_cb_data.items():
             data_c, _, _, _,  _, _, _, _ = item
             if data_c.IsChecked():
                 self.tree_ctrl.Delete(data_c)
                 data_key.append(d_key)
-                if d_key in self.list_cb_theory.keys():
+                if d_key in self.list_cb_theory:
                     theory_list_ctrl = self.list_cb_theory[d_key]
-                    theory_to_remove += theory_list_ctrl.keys()
+                    theory_to_remove += list(theory_list_ctrl.keys())
         # Remove theory from treectrl
-        for _, theory_dict in self.list_cb_theory.iteritems():
-            for key, value in theory_dict.iteritems():
+        for _, theory_dict in self.list_cb_theory.items():
+            for key, value in theory_dict.items():
                 item, _, _ = value
                 if item.IsChecked():
@@ -950 +951 @@
         # remove theory  references independently of data
         for key in theory_key:
-            for _, theory_dict in self.list_cb_theory.iteritems():
+            for _, theory_dict in self.list_cb_theory.items():
                 if key in theory_dict:
-                    for key, value in theory_dict.iteritems():
+                    for key, value in theory_dict.items():
                         item, _, _ = value
                         if item.IsChecked():
@@ -1047 +1048 @@
         if self.cb_plotpanel and self.cb_plotpanel.IsBeingDeleted():
             return
-        for _, value in self.parent.plot_panels.iteritems():
+        for _, value in self.parent.plot_panels.items():
             name_plot_panel = str(value.window_caption)
             if name_plot_panel not in self.cb_plotpanel.GetItems():
@@ -1129 +1130 @@
         #import documentation window here to avoid circular imports
         #if put at top of file with rest of imports.
-        from documentation_window import DocumentationWindow
+        from .documentation_window import DocumentationWindow
 
         _TreeLocation = "user/sasgui/guiframe/data_explorer_help.html"
@@ -1499 +1500 @@
         window.Show(True)
         window.load_data_list(list=temp_data_list)
-    except:
+    except Exception as exc:
         # raise
-        print("error", sys.exc_value)
+        print("error", exc)
 
     app.MainLoop()