From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 7 Nov 2011 10:15:08 +0000 (+0000)
Subject: Closes #13361: Raise correct exception type.
X-Git-Tag: v3.2.3rc1~414
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bd56387360e0b5ab1930640d0c4830c7fd6de23;p=thirdparty%2FPython%2Fcpython.git

Closes #13361: Raise correct exception type.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index bea290eff1a1..7dacddb06692 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1095,7 +1095,7 @@ class Manager(object):
         """
         rv = None
         if not isinstance(name, str):
-            raise ValueError('A logger name must be a string')
+            raise TypeError('A logger name must be a string')
         _acquireLock()
         try:
             if name in self.loggerDict:
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index a022680d4d26..ab66596d083c 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -294,7 +294,7 @@ class BuiltinLevelsTest(BaseTest):
         ])
 
     def test_invalid_name(self):
-        self.assertRaises(ValueError, logging.getLogger, any)
+        self.assertRaises(TypeError, logging.getLogger, any)
 
 class BasicFilterTest(BaseTest):