[Python-checkins] cpython (merge default -> default): Merge

[victor.stinner]

http://hg.python.org/cpython/rev/cc2af102c73b
changeset:   74017:cc2af102c73b
parent:      74016:49b85dba251d
parent:      74013:652605cdd3d6
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Sat Dec 17 22:40:19 2011 +0100
summary:
  Merge

files:
  Lib/logging/__init__.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -789,7 +789,7 @@
 
     def setLevel(self, level):
         """
-        Set the logging level of this handler.
+        Set the logging level of this handler.  level must be an int or a str.
         """
         self.level = _checkLevel(level)
 
@@ -1194,7 +1194,7 @@
 
     def setLevel(self, level):
         """
-        Set the logging level of this logger.
+        Set the logging level of this logger.  level must be an int or a str.
         """
         self.level = _checkLevel(level)
 

-- 
Repository URL: http://hg.python.org/cpython