Changeset cb64d86 in sasview

Timestamp:

Feb 22, 2019 2:25:03 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

82d88d5

Parents:

61379c2e

Message:

src/sas/sasgui/guiframe/CategoryInstaller.py

consistent python 2/3 handling of json dump

Location:

src/sas/sasgui

Files:

• guiframe/CategoryInstaller.py (modified) (2 diffs)
• perspectives/fitting/basepage.py (modified) (1 diff)
• plottools/toolbar.py (modified) (2 diffs)

src/sas/sasgui/guiframe/CategoryInstaller.py

@@ -20 +20 @@
 
 logger = logging.getLogger(__name__)
+
+if sys.version_info[0] > 2:
+    def json_dump(obj, filename):
+        with open(filename, 'w', newline='\n') as fd:
+            json.dump(obj, fd)
+else: # CRUFT: python 2.7 support
+    def json_dump(obj, filename):
+        with open(filename, 'wb') as fd:
+            json.dump(obj, fd)
 
 class CategoryInstaller(object):
@@ -171 +180 @@
                                                           model_enabled_dict)
 
-            json.dump(master_category_dict, open(serialized_file, 'w'))
+            json_dump(master_category_dict, serialized_file)

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

@@ -12 +12 @@
 import logging
 import traceback
-try:
+try: # CRUFT: python 2.x
     from Queue import Queue
 except ImportError:

src/sas/sasgui/plottools/toolbar.py

@@ -39 +39 @@
     try: save_figure = NavigationToolbar2WxAgg.save
     except AttributeError: pass
-    
+
     def _init_toolbar(self):
         self._parent = self.canvas.GetParent()
@@ -66 +66 @@
         # todo: get new bitmap
         # todo: update with code from matplotlib/backends/backend_wx.py
-        is_phoenix = 'phoenix' in wx.PlatformInfo
-        if is_phoenix: # wx phoenix >= 4.0.0b2
+        if 'phoenix' in wx.PlatformInfo: # wx phoenix >= 4.0.0b2
             self.AddCheckTool(self._NTB2_PAN, "Pan", _load_bitmap('move.png'),
                               shortHelp='Pan',