commit 0df6442ae50619cab1e0b6512b81d65766b38b36
author Guido van Rossum <guido@python.org> Sun Mar 02 20:47:29 2003 +0000
committer Guido van Rossum <guido@python.org> Sun Mar 02 20:47:29 2003 +0000
tree ae9065c9a16847096f71f78187d478faf776fec0
parent 206b9a779aacd1e246947f5cad3b327afba3546d

Undo the apply() removals; this code needs to run under Python 1.5.2.

Lib/logging/__init__.py

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 99e4260..12a40b0 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -874,7 +874,7 @@
         if self.manager.disable >= DEBUG:
             return
         if DEBUG >= self.getEffectiveLevel():
-            self._log(DEBUG, msg, args, **kwargs)
+            apply(self._log, (DEBUG, msg, args), kwargs)
 
     def info(self, msg, *args, **kwargs):
         """
@@ -888,7 +888,7 @@
         if self.manager.disable >= INFO:
             return
         if INFO >= self.getEffectiveLevel():
-            self._log(INFO, msg, args, **kwargs)
+            apply(self._log, (INFO, msg, args), kwargs)
 
     def warning(self, msg, *args, **kwargs):
         """
@@ -902,7 +902,7 @@
         if self.manager.disable >= WARNING:
             return
         if self.isEnabledFor(WARNING):
-            self._log(WARNING, msg, args, **kwargs)
+            apply(self._log, (WARNING, msg, args), kwargs)
 
     warn = warning
 
@@ -918,13 +918,13 @@
         if self.manager.disable >= ERROR:
             return
         if self.isEnabledFor(ERROR):
-            self._log(ERROR, msg, args, **kwargs)
+            apply(self._log, (ERROR, msg, args), kwargs)
 
     def exception(self, msg, *args):
         """
         Convenience method for logging an ERROR with exception information.
         """
-        self.error(msg, exc_info=1, *args)
+        apply(self.error, (msg,) + args, {'exc_info': 1})
 
     def critical(self, msg, *args, **kwargs):
         """
@@ -938,7 +938,7 @@
         if self.manager.disable >= CRITICAL:
             return
         if CRITICAL >= self.getEffectiveLevel():
-            self._log(CRITICAL, msg, args, **kwargs)
+            apply(self._log, (CRITICAL, msg, args), kwargs)
 
     fatal = critical
 
@@ -954,7 +954,7 @@
         if self.manager.disable >= level:
             return
         if self.isEnabledFor(level):
-            self._log(level, msg, args, **kwargs)
+            apply(self._log, (level, msg, args), kwargs)
 
     def findCaller(self):
         """
@@ -1131,7 +1131,7 @@
     """
     if len(root.handlers) == 0:
         basicConfig()
-    root.critical(msg, *args, **kwargs)
+    apply(root.critical, (msg,)+args, kwargs)
 
 fatal = critical
 
@@ -1141,14 +1141,14 @@
     """
     if len(root.handlers) == 0:
         basicConfig()
-    root.error(msg, *args, **kwargs)
+    apply(root.error, (msg,)+args, kwargs)
 
 def exception(msg, *args):
     """
     Log a message with severity 'ERROR' on the root logger,
     with exception information.
     """
-    error(msg, exc_info=1, *args)
+    apply(error, (msg,)+args, {'exc_info': 1})
 
 def warning(msg, *args, **kwargs):
     """
@@ -1156,7 +1156,7 @@
     """
     if len(root.handlers) == 0:
         basicConfig()
-    root.warning(msg, *args, **kwargs)
+    apply(root.warning, (msg,)+args, kwargs)
 
 warn = warning
 
@@ -1166,7 +1166,7 @@
     """
     if len(root.handlers) == 0:
         basicConfig()
-    root.info(msg, *args, **kwargs)
+    apply(root.info, (msg,)+args, kwargs)
 
 def debug(msg, *args, **kwargs):
     """
@@ -1174,7 +1174,7 @@
     """
     if len(root.handlers) == 0:
         basicConfig()
-    root.debug(msg, *args, **kwargs)
+    apply(root.debug, (msg,)+args, kwargs)
 
 def disable(level):
     """

Lib/logging/config.py

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 8f692c3..933bdc7 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -102,7 +102,7 @@
                     klass = eval(klass, vars(logging))
                     args = cp.get(sectname, "args")
                     args = eval(args, vars(logging))
-                    h = klass(*args)
+                    h = apply(klass, args)
                     if "level" in opts:
                         level = cp.get(sectname, "level")
                         h.setLevel(logging._levelNames[level])