Changeset 6bdf6ae in sasview

Timestamp:

Jan 11, 2012 3:28:46 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

3ad8953

Parents:

9e89e77

Message:

fix logging

Files:

• sansview/__init__.py (modified) (2 diffs)
• sansview/sansview.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

sansview/__init__.py

@@ -1 +1 @@
 __version__ = "2.0.1"
-
+__build__ = "1"
 try:
     import pkg_resources
@@ -7 +7 @@
     __build__ = str(rev)
 except:
-    __build__ = "1"
-    import sys
-    print "Error getting build version\n  %s" % sys.exc_value
+    import logging
+    logging.warning("Error getting build version\n  %s" % sys.exc_value)

sansview/sansview.py

@@ -9 +9 @@
 #copyright 2009, University of Tennessee
 ################################################################################
+import os
+import logging
+logging.basicConfig(level=logging.INFO,
+                    format='%(asctime)s %(levelname)s %(message)s',
+                    filename=os.path.join(os.path.expanduser("~"),'sansview.log'))
 
 import wx
-import os
 import sys
 # The below will make sure that sansview application uses the matplotlib font 
@@ -26 +30 @@
 # For py2exe, import config here
 import local_config
-import logging
-logging.basicConfig(level=logging.INFO,
-                    format='%(asctime)s %(levelname)s %(message)s',
-                    filename=os.path.join(gui_manager.get_user_directory(),'sansview.log'),
-                    filemode='w')
 
 def run():

setup.py

@@ -26 +26 @@
 import sansview
 VERSION = sansview.__version__
+print "Building SansView version %s %s" % (sansview.__version__, sansview.__build__)
 ##############################################################