Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/fitting/fit_thread.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/perspectives/fitting/fit_thread.py (modified) (4 diffs)

src/sas/sasgui/perspectives/fitting/fit_thread.py

@@ -12 +12 @@
 
 def map_apply(arguments):
-    return apply(arguments[0], arguments[1:])
+    fn, args = arguments[0], arguments[1:]
+    return fn(*args)
 
 class FitThread(CalcThread):
@@ -50 +51 @@
         except KeyboardInterrupt:
             msg = "Fitting: terminated by the user."
-            raise KeyboardInterrupt, msg
+            raise KeyboardInterrupt(msg)
 
     def compute(self):
@@ -76 +77 @@
                          list_q, list_q, list_handler, list_curr_thread,
                          list_reset_flag)
-            result = map(map_apply, inputs)
+            result = list(map(map_apply, inputs))
 
             self.complete(result=result,
@@ -85 +86 @@
                           elapsed=time.time() - self.starttime)
 
-        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...