Changeset 6667 for anuga_core/source/anuga/utilities/log.py

Timestamp:

Mar 31, 2009, 1:07:40 PM (16 years ago)

Author:

rwilson

Message:

Made log module run under python 2.3 and 2.4 (I hope).

File:

• anuga_core/source/anuga/utilities/log.py (modified) (4 diffs)

anuga_core/source/anuga/utilities/log.py

@@ -18 +18 @@
 Until the first call to log() the user is free to play with the module data
 to configure the logging.
+
+Note that this module uses features of the logging package that were introduced
+in python2.5.  If running on earlier versions, these features are disables:
+    . Module name + line number
 '''
 
@@ -75 +79 @@
     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:
@@ -99 +106 @@
                         logging.getLevelName(log_logging_level),
                         logging.getLevelName(console_logging_level)))
-        logging.log(logging.CRITICAL, start_msg,
-                    extra={'mname': __name__, 'lnum': 0})
+        if version_major >= 2 and version_minor >= 5:
+            logging.log(logging.CRITICAL, start_msg,
+                        extra={'mname': __name__, 'lnum': 0})
+        else:
+            logging.log(logging.CRITICAL, start_msg)
 
         # mark module as *setup*
@@ -113 +123 @@
             break
 
-    logging.log(level, msg, extra={'mname': fname, 'lnum': lnum})
+    if version_major >= 2 and version_minor >= 5:
+        logging.log(level, msg, extra={'mname': fname, 'lnum': lnum})
+    else:
+        logging.log(level, msg)
 
 ################################################################################