Changeset 440

Timestamp:

10/14/09 17:23:01 (2 years ago)

Author:

apdavison

Message:

Dependency warnings now use the warnings module instead of print statements (which means they can be turned off). Added some logging-related stuff.

Files:

• trunk/src/__init__.py (modified) (6 diffs)

trunk/src/__init__.py

@@ -38 +38 @@
 __all__ = ['analysis', 'parameters', 'plotting', 'signals', 'stgen', 'io', 'datastore', 'utilities', 'spike2', 'random', 'optimize', 'tisean']
 __version__ = "0.1.0 (Asynchronous Astrocyte)"
+import warnings
 
 #########################################################
@@ -68 +69 @@
 #########################################################
 
+class DependencyWarning(UserWarning):
+    pass
+
 def get_import_warning(name):
-    return ''' ----------------- Dependency Warning ---------------------
-** %s ** package is not installed. 
+    return '''** %s ** package is not installed. 
 To have functions using %s please install the package.
 website : %s
@@ -76 +79 @@
 
 def get_runtime_warning(name, errmsg):
-    return ''' ----------------- Dependency Warning ---------------------
-** %s ** package is installed but cannot be imported. The error message is: %s 
-''' %(name, errmsg)
+    return '** %s ** package is installed but cannot be imported. The error message is: %s' %(name, errmsg)
 
 def check_numpy_version():
@@ -102 +103 @@
             dependencies[name]['is_present'] = True
         except ImportError:
-            print get_import_warning(name)
+            warnings.warn(get_import_warning(name), DependencyWarning)
         except RuntimeError, errmsg:
-            print get_runtime_warning(name, errmsg)
+            warnings.warn(get_runtime_warning(name, errmsg), DependencyWarning)
         dependencies[name]['check'] = True
         return dependencies[name]['is_present']
@@ -181 +182 @@
 
 
+class NameOrLevelFilter(logging.Filter):
+    """
+    Logging filter which allows messages that either meet the same name criteria
+    as the base filter class, or have a level >= the level specified.
+    
+    The intended use is when you want to receive most messages at a high level,
+    but receive certain named messages at a lower level, e.g. for debugging a
+    particular component.
+    """
+    def __init__(self, name='', level=logging.INFO):
+        self.name = name
+        self.nlen = len(name)
+        self.level = level
+        
+    def filter(self, record):
+        allow_by_name = logging.Filter.filter(self, record)
+        allow_by_level = record.levelno >= self.level
+        return (allow_by_name or allow_by_level)
+    
+
 def init_logging(filename, file_level=logging.INFO, console_level=logging.WARNING):
     logging.basicConfig(level=file_level,
-                        format='%(asctime)s %(levelname)s %(message)s', # %(pathname)s %(module)s %(funcName)s',
+                        format='%(asctime)s %(name)-10s %(levelname)-6s %(message)s [%(pathname)s:%(lineno)d]',
                         filename=filename,
                         filemode='w')
@@ -190 +211 @@
     console.setFormatter(FancyFormatter('%(message)s'))
     logging.getLogger('').addHandler(console)
+    return console