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

Timestamp:

Sep 23, 2017 4:24:27 PM (7 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:

b963b20, fca1f50

Parents:

9706d88 (diff), dba8557 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-887-reorg' into ticket-853-fit-gui-to-calc

File:

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

src/sas/sasgui/guiframe/CategoryInstaller.py

@@ -15 +15 @@
 from collections import defaultdict, OrderedDict
 
+from sas.sasgui import get_user_dir
+
 USER_FILE = 'categories.json'
 
@@ -25 +27 @@
     Note - class is entirely static!
     """
-
-    def __init__(self):
-        """ initialization """
 
     @staticmethod
@@ -104 +103 @@
         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