Changeset 0b709f2c in sasview

Timestamp:

Mar 20, 2016 9:55:05 AM (8 years ago)

Author:

smk78

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:

50008e3, 9e531f2

Parents:

54a2c927 (diff), f718919 (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 'master' of ​https://github.com/SasView/sasview.git

Files:

• sasview/sasview.py (modified) (1 diff)
• src/sas/sasgui/guiframe/CategoryInstaller.py (modified) (1 diff)
• docs/sphinx-docs/source/user/README-ABOUT-TOCTREE-FILES.TXT (added)

sasview/sasview.py

@@ -79 +79 @@
 #wxcruft.trace_new_id()
 
-# The below will make sure that sasview application uses the matplotlib font
-# bundled with sasview.
-if hasattr(sys, 'frozen'):
-    mplconfigdir = os.path.join(os.path.expanduser("~"), '.matplotlib')
-    if not os.path.exists(mplconfigdir):
-        os.mkdir(mplconfigdir)
-    os.environ['MPLCONFIGDIR'] = mplconfigdir
-    reload(sys)
-    sys.setdefaultencoding("iso-8859-1")
+#Always use private .matplotlib setup to avoid conflicts with other
+#uses of matplotlib
+mplconfigdir = os.path.join(os.path.expanduser("~"),'.sasview','.matplotlib')
+if not os.path.exists(mplconfigdir):
+    os.mkdir(mplconfigdir)
+os.environ['MPLCONFIGDIR'] = mplconfigdir
+reload(sys)
+sys.setdefaultencoding("iso-8859-1")
 from sas.sasgui.guiframe import gui_manager
 from sas.sasgui.guiframe.gui_style import GUIFRAME

src/sas/sasgui/guiframe/CategoryInstaller.py

@@ -176 +176 @@
             json.dump( master_category_dict,
                          open(serialized_file, 'wb') )
-            
-            try:
-                #It happens only in source environment
-                shutil.copyfile(serialized_file, default_file)
-            except:
-                pass
-