From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 8 Jan 2007 10:12:29 +0000 (+0000)
Subject: Backported changes from trunk:
X-Git-Tag: v2.5.1c1~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f96725af8bf2a394b85104be13583ff091c6a634;p=thirdparty%2FPython%2Fcpython.git

Backported changes from trunk:
Made func argument in LogRecord.__init__ optional.
Improved performance of _fixupChildren.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index dc3400d00dd9..c72730843e46 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -214,7 +214,7 @@ class LogRecord:
     information to be logged.
     """
     def __init__(self, name, level, pathname, lineno,
-                 msg, args, exc_info, func):
+                 msg, args, exc_info, func=None):
         """
         Initialize a logging record with interesting information.
         """
@@ -910,9 +910,12 @@ class Manager:
         Ensure that children of the placeholder ph are connected to the
         specified logger.
         """
-        #for c in ph.loggers:
+        name = alogger.name
+        namelen = len(name)
         for c in ph.loggerMap.keys():
-            if string.find(c.parent.name, alogger.name) <> 0:
+            #The if means ... if not c.parent.name.startswith(nm)
+            #if string.find(c.parent.name, nm) <> 0:
+            if c.parent.name[:namelen] != name:
                 alogger.parent = c.parent
                 c.parent = alogger