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

Timestamp:

Oct 11, 2018 2: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_manager.py (modified) (13 diffs)

src/sas/sasgui/guiframe/data_manager.py

@@ -51 +51 @@
         _str += "No of states  is %s \n" % str(len(self.stored_data))
         n_count = 0
-        for  value in self.stored_data.values():
+        for value in self.stored_data.values():
             n_count += 1 
             _str += "State No %s \n"  % str(n_count)
@@ -134 +134 @@
         receive a list of 
         """
-        for id, data in data_list.iteritems():
+        for id, data in data_list.items():
             if id  in self.stored_data:
                 msg = "Data manager already stores %s" % str(data.name)
@@ -150 +150 @@
         """
         """
-        if prev_data.id not in self.stored_data.keys():
+        if prev_data.id not in self.stored_data:
             return None, {}
         data_state = self.stored_data[prev_data.id] 
         self.stored_data[new_data.id]  = data_state.clone()
         self.stored_data[new_data.id].data = new_data
-        if prev_data.id in self.stored_data.keys():
+        if prev_data.id in self.stored_data:
             del self.stored_data[prev_data.id] 
         return prev_data.id, {new_data.id: self.stored_data[new_data.id]}
@@ -165 +165 @@
         if data_id is None and theory is not None:
             uid = theory.id
-        if uid in self.stored_data.keys():
+        if uid in self.stored_data:
              data_state = self.stored_data[uid] 
         else:
@@ -195 +195 @@
                 if search_id == d_id:
                     _selected_data[search_id] = data
-                if search_id in theory_list.keys():
+                if search_id in theory_list:
                      _selected_theory_list[search_id] = theory_list[search_id]
                    
@@ -204 +204 @@
         """
         """
-        return self.freeze_theory(self.stored_data.keys(), theory_id)
+        return self.freeze_theory(list(self.stored_data.keys()), theory_id)
         
     def freeze_theory(self, data_id, theory_id):
@@ -215 +215 @@
                 theory_list = data_state.get_theory()
                 for t_id in theory_id:
-                    if t_id in theory_list.keys():
+                    if t_id in theory_list:
                         theory_data, theory_state = theory_list[t_id]
                         new_theory = copy.deepcopy(theory_data)
@@ -235 +235 @@
         """
         for d_id in data_id:
-            if d_id in self.stored_data.keys():
+            if d_id in self.stored_data:
                 data_state = self.stored_data[d_id]
                 if data_state.data.name in self.data_name_dict:
@@ -253 +253 @@
                 data_state = self.stored_data[d_id]
                 theory_list = data_state.get_theory()
-                if theory_id in theory_list.keys():
+                if theory_id in theory_list:
                     del theory_list[theory_id]
         #del pure theory
@@ -273 +273 @@
         _selected_data = {}
         for selected_name in name_list:
-            for id, data_state in self.stored_data.iteritems():
+            for id, data_state in self.stored_data.items():
                 if data_state.data.name == selected_name:
                     _selected_data[id] = data_state.data
@@ -283 +283 @@
         """
         for selected_name in name_list:
-            for id, data_state in self.stored_data.iteritems():
+            for id, data_state in self.stored_data.items():
                 if data_state.data.name == selected_name:
                     del self.stored_data[id]
@@ -293 +293 @@
         _selected_data_state = {}
         for id in data_id:
-            if id in self.stored_data.keys():
+            if id in self.stored_data:
                 _selected_data_state[id] = self.stored_data[id]
         return _selected_data_state
@@ -303 +303 @@
         return self.stored_data
     
-
-