Changeset 6481 for main/waeup.sirp/trunk/src/waeup

Timestamp:

27 Jun 2011, 10:31:10 (13 years ago)

Author:

uli

Message:

Move logger interfaces to final destination.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/root.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• utils/logger.py (modified) (2 diffs)
• utils/tests/test_logger.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py

@@ -27 +27 @@
 from hurry.query.interfaces import IQuery
 from zope.component import getUtility
-from waeup.sirp.interfaces import IWAeUPSIRPPluggable
-from waeup.sirp.utils.logger import ISiteLoggers
+from waeup.sirp.interfaces import IWAeUPSIRPPluggable, ISiteLoggers
 from waeup.sirp.applicants.interfaces import IApplicantsRoot
 from waeup.sirp.utils.helpers import get_current_principal
@@ -59 +58 @@
         else:
             user = user.id
-        self.logger.info('%s - %s - %s  - %s' % (user, target, ob_class, comment))
+        self.logger.info('%s - %s - %s  - %s' % (
+                user, target, ob_class, comment))
 
 class ApplicantsPlugin(grok.GlobalUtility):

main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py

@@ -448 +448 @@
         """
         pass
+
+class ISiteLoggers(Interface):
+
+    loggers = Attribute("A list or generator of registered WAeUPLoggers")
+
+    def register(name, filename=None, site=None, **options):
+        """Register a logger `name` which logs to `filename`.
+
+        If `filename` is not given, logfile will be `name` with
+        ``.log`` as filename extension.
+        """
+
+    def unregister(name):
+        """Unregister a once registered logger.
+        """
+
+class ILogger(Interface):
+    """A logger cares for setup, update and restarting of a Python logger.
+    """
+
+    logger = Attribute("""A :class:`logging.Logger` instance""")
+
+
+    def __init__(name, filename=None, site=None, **options):
+        """Create a WAeUP logger instance.
+        """
+        pass
+
+    def setup():
+        """Create a Python :class:`logging.Logger` instance.
+
+        The created logger is based on the params given by constructor.
+        """
+        pass
+
+    def update(**options):
+        """Update the logger.
+
+        Updates the logger respecting modified `options` and changed
+        paths.
+        """
+

main/waeup.sirp/trunk/src/waeup/sirp/utils/logger.py

@@ -27 +27 @@
 import logging
 from zope.interface import Interface, Attribute
-
-class ISiteLoggers(Interface):
-
-    loggers = Attribute("A list or generator of registered WAeUPLoggers")
-
-    def register(name, filename=None, site=None, **options):
-        """Register a logger `name` which logs to `filename`.
-
-        If `filename` is not given, logfile will be `name` with
-        ``.log`` as filename extension.
-        """
-
-    def unregister(name):
-        """Unregister a once registered logger.
-        """
+from waeup.sirp.interfaces import ISiteLoggers, ILogger
 
 class SiteLoggers(object):
@@ -72 +58 @@
     def keys(self):
         return self._loggers.keys()
-
-class ILogger(Interface):
-    """A logger cares for setup, update and restarting of a Python logger.
-    """
-
-    logger = Attribute("""A :class:`logging.Logger` instance""")
-
-
-    def __init__(name, filename=None, site=None, **options):
-        """Create a WAeUP logger instance.
-        """
-        pass
-
-    def setup():
-        """Create a Python :class:`logging.Logger` instance.
-
-        The created logger is based on the params given by constructor.
-        """
-        pass
-
-    def update(**options):
-        """Update the logger.
-
-        Updates the logger respecting modified `options` and changed
-        paths.
-        """
 
 class WAeUPLogger(object):

main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_logger.py

@@ -30 +30 @@
 from zope.interface.verify import verifyClass, verifyObject
 from waeup.sirp.app import University
+from waeup.sirp.interfaces import ISiteLoggers, ILogger
 from waeup.sirp.testing import FunctionalLayer, doctestsuite_for_module
 from waeup.sirp.utils.logger import (
-    ISiteLoggers, ILogger, SiteLoggers, WAeUPLogger, SiteLoggersRepository)
+    SiteLoggers, WAeUPLogger, SiteLoggersRepository)
 
 class SiteLoggersTests(FunctionalTestCase):