Changes in src/sas/sasgui/guiframe/CategoryInstaller.py [a26f67f:cb64d86] in sasview

File:

• src/sas/sasgui/guiframe/CategoryInstaller.py (modified) (4 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):
@@ -121 +130 @@
         """
         _model_dict = {model.name: model for model in model_list}
-        _model_list = _model_dict.keys()
+        _model_list = list(_model_dict.keys())
 
         serialized_file = None
@@ -146 +155 @@
                         by_model_dict.pop(model_name)
                         model_enabled_dict.pop(model_name)
-                    except Exception:
-                        logger.error("CategoryInstaller: %s", sys.exc_value)
+                    except Exception as exc:
+                        logger.error("CategoryInstaller: %s", exc)
                 else:
                     add_list.remove(model_name)
@@ -171 +180 @@
                                                           model_enabled_dict)
 
-            json.dump(master_category_dict, open(serialized_file, 'wb'))
+            json_dump(master_category_dict, serialized_file)