[CalendarServer-changes] [11368] CalendarServer/trunk/twext/python/log.py

[source_changes at macosforge.org]

Revision: 11368
          http://trac.calendarserver.org//changeset/11368
Author:   wsanchez at apple.com
Date:     2013-06-14 15:17:21 -0700 (Fri, 14 Jun 2013)
Log Message:
-----------
minor cleanup

Modified Paths:
--------------
    CalendarServer/trunk/twext/python/log.py

Modified: CalendarServer/trunk/twext/python/log.py
===================================================================
--- CalendarServer/trunk/twext/python/log.py	2013-06-14 22:04:21 UTC (rev 11367)
+++ CalendarServer/trunk/twext/python/log.py	2013-06-14 22:17:21 UTC (rev 11368)
@@ -25,7 +25,7 @@
 
     ...
 
-    log.debug("Got data: {data}.", data=data)
+    log.debug("Got data: {data!r}.", data=data)
 
 Or in a class::
 
@@ -35,7 +35,7 @@
         log = Logger()
 
         def oops(self, data):
-            self.log.error("Oops! Invalid data from server: {data}", data=data)
+            self.log.error("Oops! Invalid data from server: {data!r}", data=data)
 
 C{Logger}s have namespaces, for which logging can be configured independently.
 Namespaces may be specified by passing in a C{namespace} argument to L{Logger}
@@ -256,7 +256,7 @@
     """
     try:
         return (
-            u"Unable to format event {event}: {error}"
+            u"Unable to format event {event!r}: {error}"
             .format(event=event, error=error)
         )
     except BaseException as error:
@@ -272,11 +272,11 @@
 
             for key, value in event.items():
                 try:
-                    items.append(u"{key} = ".format(key=key))
+                    items.append(u"{key!r} = ".format(key=key))
                 except:
                     items.append(u"<UNFORMATTABLE KEY> = ")
                 try:
-                    items.append(u"{value}".format(value=value))
+                    items.append(u"{value!r}".format(value=value))
                 except:
                     items.append(u"<UNFORMATTABLE VALUE>")
 
@@ -360,7 +360,7 @@
         """
         if level not in LogLevel.iterconstants(): # FIXME: Updated Twisted supports 'in' on constants container
             self.failure(
-                "Got invalid log {invalidLevel} level in {logger}.emit().",
+                "Got invalid log level {invalidLevel!r} in {logger}.emit().",
                 Failure(InvalidLogLevelError(level)),
                 invalidLevel = level,
                 logger = self,
@@ -511,7 +511,7 @@
         """
         Log an event.
 
-        @type event: C{dict} with C{str} keys.
+        @type event: C{dict} with (native) C{str} keys.
 
         @param event: A dictionary with arbitrary keys as defined by
             the application emitting logging events, as well as keys
@@ -571,8 +571,7 @@
                 #
                 self.removeObserver(observer)
                 try:
-                    self.log.failure("Observer {observer} raised an exception; removing.")
-                    Failure().printTraceback()
+                    self.log.failure("Observer {observer} raised an exception; removing.", observer=observer)
                 except:
                     pass
                 finally:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130614/21eedc03/attachment-0001.html>