Changeset efe730d in sasview for src/sas/sasgui/guiframe/CategoryInstaller.py

Timestamp:

Jun 25, 2016 4:07:33 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

899e084

Parents:

9501661

git-author:

Paul Kienzle <pkienzle@…> (06/25/16 02:23:59)

git-committer:

Paul Kienzle <pkienzle@…> (06/25/16 04:07:33)

Message:

move sasview to src/sas/sasview and refactor bundled apps for easier debugging

File:

• src/sas/sasgui/guiframe/CategoryInstaller.py (modified) (3 diffs)

src/sas/sasgui/guiframe/CategoryInstaller.py

@@ -11 +11 @@
 import os
 import sys
-import shutil
 import json
 from collections import defaultdict
+
+from sas.sasgui import get_user_dir
 
 USER_FILE = 'categories.json'
@@ -68 +69 @@
 
     @staticmethod
-    def _get_home_dir():
-        """
-        returns the users sasview config dir
-        """
-        return os.path.join(os.path.expanduser("~"), ".sasview")
-
-    @staticmethod
     def _regenerate_model_dict(master_category_dict):
         """
@@ -113 +107 @@
         returns the user data file, eg .sasview/categories.json.json
         """
-        return os.path.join(CategoryInstaller._get_home_dir(),
-                            USER_FILE)
+        return os.path.join(get_user_dir(), USER_FILE)
 
     @staticmethod