Changeset 27b7acc in sasview for src/sans/guiframe

Timestamp:

Apr 3, 2014 7:28:51 PM (11 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

Location:

src/sans/guiframe

Files:

• CategoryInstaller.py (modified) (8 diffs)
• CategoryManager.py (modified) (3 diffs)
• customdir.py (modified) (1 diff)

src/sans/guiframe/CategoryInstaller.py

@@ -12 +12 @@
 import sys
 import shutil
-import cPickle as pickle
+import json
 from collections import defaultdict
 
-USER_FILE = 'serialized_cat.p'
+USER_FILE = 'serialized_cat.json'
 
 class CategoryInstaller:
@@ -45 +45 @@
     
     @staticmethod
-    def _get_default_cat_p_dir():
+    def _get_default_cat_file_dir():
         """
-        returns the dir where default_cat.p should be
+        returns the dir where default_cat.j should be
         """
         # The default categories file is usually found with the code, except
@@ -53 +53 @@
         # py2exe (it will be in the exec dir).
         import sans.sansview
-        cat_file = "default_categories.p"
+        cat_file = "default_categories.json"
         
         possible_cat_file_paths = [
@@ -111 +111 @@
     def get_user_file():
         """
-        returns the user data file, eg .sasview/serialized_cat.p
+        returns the user data file, eg .sasview/serialized_cat.json
         """
         return os.path.join(CategoryInstaller._get_home_dir(),
@@ -120 +120 @@
         """
         returns the path of the default file
-        e.g. blahblah/default_categories.p
+        e.g. blahblah/default_categories.json
         """
         return os.path.join(\
-            CategoryInstaller._get_default_cat_p_dir(), "default_categories.p")
+            CategoryInstaller._get_default_cat_file_dir(), "default_categories.json")
         
     @staticmethod
@@ -129 +129 @@
         """
         the main method of this class
-        makes sure serialized_cat.p exists and if not
+        makes sure serialized_cat.json exists and if not
         compile it and install
         :param homefile: Override the default home directory
@@ -146 +146 @@
         else:
             cat_file = open(default_file, 'rb')
-        master_category_dict = pickle.Unpickler(cat_file).load()
+        master_category_dict = json.load(cat_file)
+#        master_category_dict = pickle.Unpickler(cat_file).load()
         (by_model_dict, model_enabled_dict) = \
                 CategoryInstaller._regenerate_model_dict(master_category_dict)
@@ -173 +174 @@
                                                           model_enabled_dict)
             
-            pickle.dump( master_category_dict,
+            json.dump( master_category_dict,
                          open(serialized_file, 'wb') )
             

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'

src/sans/guiframe/customdir.py

@@ -35 +35 @@
         os.makedirs(dir)
     file = os.path.join(dir, "custom_config.py")
-    u_dir = _find_usersasview_dir()
-    cat_file = os.path.join(u_dir, "serialized_cat.p")
-    # Place example user models as needed
+    cat_file = CategoryInstaller.get_user_file()
+    # If the user category file doesn't exist copy the default to
+    # the user directory
     if not os.path.isfile(cat_file):
         try: