From 59b9cdf4e6e91eb2bcaa36cbe94881fc3d290ba2 Mon Sep 17 00:00:00 2001 From: Joshua Boverhof Date: Wed, 18 Aug 2004 23:12:09 +0000 Subject: [PATCH] ---------------------------------------------------------------------- Modified Files: __init__.py -- cleaned up the module, removed some old code. ---------------------------------------------------------------------- --- __init__.py | 41 +++++++---------------------------------- 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/__init__.py b/__init__.py index f9fee86..04b518b 100644 --- a/__init__.py +++ b/__init__.py @@ -8,41 +8,14 @@ import XMLname from ConfigParser import NoSectionError LOGGING = 'logging.txt' -try: - from logging import getLogger - import logging -except ImportError, ex: - class logger: - '''Default logger for python2.2 - ''' - def __init__(self, name): - self.name = name - self.out = out - - def write(self, arg): - self.out.write(arg) - - def _write(self, severity, msg, *args, **kw): - self.write('%s: %s -- %s' %(severity, self.name, msg)) - - def error(self, msg, *args, **kw): - self._write('ERROR', msg, *args, **kw) +from logging import getLogger +import logging +import logging.config - def warning(self, msg, *args, **kw): - self._write('WARNING', msg, *args, **kw) - - def critical(self, msg, *args, **kw): - self._write('CRITICAL', msg, *args, **kw) - - def getLogger(name): - return logger(name) - -else: - import logging.config - try: - logging.config.fileConfig(LOGGING) - except (NoSectionError,), ex: - logging.basicConfig() +try: + logging.config.fileConfig(LOGGING) +except (NoSectionError,), ex: + logging.basicConfig() class Base: def __init__(self, module=__name__):