SF Patch #638825 logging module

Fix pychecker warnings, remove unused imports and rename root

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 1288301d7c1a406f5bb861876064bf0148d116da..cb578c595778725f9b6fe1b7d9fe698a171215b4 100644 (file)
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -26,7 +26,7 @@ Copyright (C) 2001-2002 Vinay Sajip. All Rights Reserved.
 To use, simply 'import logging' and log away!
 """
 
-import sys, os, types, time, string, struct, cPickle, cStringIO
+import sys, os, types, time, string, cStringIO
 
 try:
     import thread
@@ -713,11 +713,11 @@ class Manager:
     There is [under normal circumstances] just one Manager instance, which
     holds the hierarchy of loggers.
     """
-    def __init__(self, root):
+    def __init__(self, rootnode):
         """
         Initialize the manager with the root node of the logger hierarchy.
         """
-        self.root = root
+        self.root = rootnode
         self.disable = 0
         self.emittedNoHandlerWarning = 0
         self.loggerDict = {}