Changeset 212bfc2 in sasview for src/sas/sasgui/guiframe/CategoryManager.py

Timestamp:

Oct 7, 2016 3:11:40 PM (8 years ago)

Author:

mathieu

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b61bd57

Parents:

60df6c1

Message:

Pull categories from models. Get rid of default categories. Fixes #535

File:

• src/sas/sasgui/guiframe/CategoryManager.py (modified) (2 diffs)

src/sas/sasgui/guiframe/CategoryManager.py

@@ -13 +13 @@
 import sys
 import os
+import logging
 from wx.lib.mixins.listctrl import CheckListCtrlMixin, ListCtrlAutoWidthMixin
 from collections import defaultdict
@@ -366 +367 @@
         """
         try:
-            file = CategoryInstaller.get_user_file()
-            if os.path.isfile(file):
-                cat_file = open(file, 'rb')
-#               self.master_category_dict = pickle.load(cat_file)
-                self.master_category_dict = json.load(cat_file)
-            else:
-                cat_file = open(CategoryInstaller.get_default_file(), 'rb')
-#                       self.master_category_dict = pickle.load(cat_file)
-                self.master_category_dict = json.load(cat_file)
-            cat_file.close()
+            cat_file = CategoryInstaller.get_user_file()
+            self.master_category_dict = {}
+            if os.path.isfile(cat_file):
+                with open(cat_file, 'rb') as f:
+                    self.master_category_dict = json.load(f)
         except IOError:
-            print 'Problem reading in category file. Please review'
-
+            logging.error('Problem reading in category file.')
 
         self._regenerate_model_dict()