Changeset f4a1433 in sasview for src/sas/logger_config.py

Timestamp:

Oct 24, 2017 2:44:26 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (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' into ESS_GUI

File:

• src/sas/logger_config.py (moved) (moved from sasview/logger_config.py) (2 diffs)

src/sas/logger_config.py

@@ -6 +6 @@
 import os.path
 
-#import pkg_resources
+import pkg_resources
 
 
@@ -70 +70 @@
         # To avoid the exception in OSx
         # NotImplementedError: resource_filename() only supported for .egg, not .zip
-        #try:
-        #    places_to_look_for_conf_file.append(
-        #        pkg_resources.resource_filename(__name__, filename))
-        #except NotImplementedError:
-        #    pass
+        try:
+            places_to_look_for_conf_file.append(
+                pkg_resources.resource_filename(__name__, filename))
+        except NotImplementedError:
+            pass
 
         for filepath in places_to_look_for_conf_file: