Changeset 27b7acc in sasview for src/sans/guiframe/CategoryManager.py

Timestamp:

Apr 3, 2014 7:28:51 PM (10 years ago)

Author:

butler

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

bbd97e5

Parents:

34dbaf4

Message:

converted stored category file from pickle to json and a bit of cleanup

File:

• src/sans/guiframe/CategoryManager.py (modified) (3 diffs)

src/sans/guiframe/CategoryManager.py

@@ -15 +15 @@
 from wx.lib.mixins.listctrl import CheckListCtrlMixin, ListCtrlAutoWidthMixin
 from collections import defaultdict
-import cPickle as pickle
+import json
 from sans.guiframe.events import ChangeCategoryEvent
 from sans.guiframe.CategoryInstaller import CategoryInstaller
@@ -294 +294 @@
         cat_file = open(CategoryInstaller.get_user_file(), 'wb')
 
-        pickle.dump( self.master_category_dict, cat_file )
+        json.dump(self.master_category_dict, cat_file )
         
         cat_file.close()
@@ -303 +303 @@
         """
         try:
-                file = CategoryInstaller.get_user_file()
-                if os.path.isfile(file):
-                    cat_file = open(file, 'rb')
-                    self.master_category_dict = pickle.load(cat_file)
-                else:
-                        cat_file = open(CategoryInstaller.get_default_file(), 'rb')
-                        self.master_category_dict = pickle.load(cat_file)
-                cat_file.close()
+            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()
         except IOError:
             print 'Problem reading in category file. Please review'