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

src/sas/sasgui/perspectives/calculator/data_editor.py

@@ -7 +7 @@
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.dataloader.data_info import Data2D
-from detector_editor import DetectorDialog
-from collimation_editor import CollimationDialog
-from console import ConsoleDialog
 
 from sas.sasgui.guiframe.events import StatusEvent
+
+from .detector_editor import DetectorDialog
+from .collimation_editor import CollimationDialog
+from .console import ConsoleDialog
+
 
 
@@ -397 +399 @@
         if data is None:
             return
-        from sample_editor import SampleDialog
+        from .sample_editor import SampleDialog
         dlg = SampleDialog(parent=self, sample=data.sample)
         dlg.set_manager(self)
@@ -409 +411 @@
         if data is None:
             return
-        from source_editor import SourceDialog
+        from .source_editor import SourceDialog
         dlg = SourceDialog(parent=self, source=data.source)
         dlg.set_manager(self)
@@ -426 +428 @@
         wlist = '|'.join(cards)
 
-        dlg = wx.FileDialog(self, "Choose a file", location, "", wlist, wx.OPEN)
+        dlg = wx.FileDialog(self, "Choose a file", location, "", wlist, wx.FD_OPEN)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
@@ -527 +529 @@
         try:
             #Load data
-            from load_thread import DataReader
+            from .load_thread import DataReader
             ## If a thread is already started, stop it
             if self.reader is not None and self.reader.isrunning():
@@ -535 +537 @@
                                     updatefn=None)
             self.reader.queue()
-        except:
-            msg = "Data Editor: %s" % (sys.exc_value)
+        except Exception as exc:
+            msg = "Data Editor: %s" % exc
             load_error(msg)
             return