Changeset b3e8629 in sasview for src/sas/qtgui/Perspectives/Fitting/FitThread.py

Timestamp:

Nov 9, 2017 6:41:54 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

cee5c78

Parents:

749b715

git-author:

Piotr Rozyczko <rozyczko@…> (10/26/17 01:13:05)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:41:54)

Message:

Initial changes to make SasView? run with python3

File:

• src/sas/qtgui/Perspectives/Fitting/FitThread.py (modified) (4 diffs)

src/sas/qtgui/Perspectives/Fitting/FitThread.py

@@ -14 +14 @@
 
 def map_apply(arguments):
-    return apply(arguments[0], arguments[1:])
+    return arguments[0](*arguments[1:])
 
 class FitThread(CalcThread):
@@ -55 +55 @@
         except KeyboardInterrupt:
             msg = "Fitting: terminated by the user."
-            raise KeyboardInterrupt, msg
+            raise KeyboardInterrupt(msg)
 
     def compute(self):
@@ -71 +71 @@
             list_q = [None]*fitter_size
 
-            inputs = zip(list_map_get_attr, self.fitter, list_fit_function,
+            inputs = list(zip(list_map_get_attr, self.fitter, list_fit_function,
                          list_q, list_q, list_handler, list_curr_thread,
-                         list_reset_flag)
-            result = map(map_apply, inputs)
+                         list_reset_flag))
+            result = list(map(map_apply, inputs))
             results = (result, time.time()-self.starttime)
             if self.handler:
@@ -81 +81 @@
                 return (results)
 
-        except KeyboardInterrupt, msg:
+        except KeyboardInterrupt as msg:
             # Thread was interrupted, just proceed and re-raise.
             # Real code should not print, but this is an example...