Changeset 5251ec6 in sasview for src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.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/local_perspectives/data_loader/data_loader.py (modified) (3 diffs)

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -70 +70 @@
                 cards.remove(item)
         wlist = '|'.join(cards)
-        style = wx.OPEN | wx.FD_MULTIPLE
+        style = wx.FD_OPEN | wx.FD_MULTIPLE
         dlg = wx.FileDialog(self.parent,
                             "Choose a file",
@@ -196 +196 @@
                                                       error_message)
                     if data_error:
-                        if basename in file_errors.keys():
+                        if basename in file_errors:
                             file_errors[basename] += [error_message]
                         else:
@@ -219 +219 @@
         if len(file_errors) > 0:
             error_message = ""
-            for filename, error_array in file_errors.iteritems():
+            for filename, error_array in file_errors.items():
                 error_message += "The following issues were found whilst "
                 error_message += "loading {}:\n".format(filename)