Changeset 6892

Timestamp:

Apr 24, 2009, 9:37:39 AM (15 years ago)

Author:

rwilson

Message:

Better error handling.

Location:

anuga_core/source/anuga/utilities

Files:

• log.py (modified) (10 diffs)
• system_tools.py (modified) (2 diffs)

anuga_core/source/anuga/utilities/log.py

@@ -60 +60 @@
 NOTSET = logging.NOTSET
 
+# get True if python version 2.5 or later
+(version_major, version_minor, _, _, _) = sys.version_info
+new_python = ((version_major == 2 and version_minor >= 5) or version_major > 2)
+
 
 ################################################################################
@@ -79 +83 @@
     global _setup, log_logging_level
 
-    # get running python version for later
-    (version_major, version_minor, _, _, _) = sys.version_info
-
     # have we been setup?
     if not _setup:
@@ -89 +90 @@
 
         # setup the file logging system
-        if version_major >= 2 and version_minor >= 5:
+        if new_python:
             fmt = '%(asctime)s %(levelname)-8s %(mname)25s:%(lnum)-4d|%(message)s'
         else:
@@ -109 +110 @@
                         logging.getLevelName(log_logging_level),
                         logging.getLevelName(console_logging_level)))
-        if version_major >= 2 and version_minor >= 5:
+        if new_python:
             logging.log(logging.CRITICAL, start_msg,
                         extra={'mname': __name__, 'lnum': 0})
@@ -127 +128 @@
             break
 
-    if version_major >= 2 and version_minor >= 5:
+    if new_python:
         logging.log(level, msg, extra={'mname': fname, 'lnum': lnum})
     else:
@@ -139 +140 @@
 # @brief Shortcut for log(DEBUG, msg).
 # @param msg Message string to log at logging.DEBUG level.
-def debug(msg):
+def debug(msg=''):
     log(logging.DEBUG, msg)
 
@@ -145 +146 @@
 # @brief Shortcut for log(INFO, msg).
 # @param msg Message string to log at logging.INFO level.
-def info(msg):
+def info(msg=''):
     log(logging.INFO, msg)
 
@@ -151 +152 @@
 # @brief Shortcut for log(WARNING, msg).
 # @param msg Message string to log at logging.WARNING level.
-def warning(msg):
+def warning(msg=''):
     log(logging.WARNING, msg)
 
@@ -157 +158 @@
 # @brief Shortcut for log(ERROR, msg).
 # @param msg Message string to log at logging.ERROR level.
-def error(msg):
+def error(msg=''):
     log(logging.ERROR, msg)
 
@@ -163 +164 @@
 # @brief Shortcut for log(CRITICAL, msg).
 # @param msg Message string to log at logging.CRITICAL level.
-def critical(msg):
+def critical(msg=''):
     log(logging.CRITICAL, msg)
 

anuga_core/source/anuga/utilities/system_tools.py

@@ -18 +18 @@
 
     fid = open(filename, 'a')
-    if verbose: print s
+    if verbose: s
     fid.write(s + '\n')
     fid.close()
@@ -426 +426 @@
         print 'Error received from proxy:\n%s' % str(e)
         print 'Possibly the user/password is wrong.'
-        return (False, auth)
+        return (False, (httpproxy, proxyuser, proxypass))
 
     # transfer file to local filesystem