Closes #13361: Raise correct exception type.

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index a0c4cb7233c82327a75f4877176356304c982175..dad69aebca3ca05cbaba64d69e528ed3ca990d4a 100644 (file)
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1008,7 +1008,7 @@ class Manager(object):
         """
         rv = None
         if not isinstance(name, basestring):
-            raise ValueError('A logger name must be string or Unicode')
+            raise TypeError('A logger name must be string or Unicode')
         if isinstance(name, unicode):
             name = name.encode('utf-8')
         _acquireLock()

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index b2d0a2bda62301cc64f7c07f6f8162c0c632ff10..2aac3603dceddc6ddeaaf0baece5a2f4455b3e65 100644 (file)
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -273,7 +273,7 @@ class BuiltinLevelsTest(BaseTest):
         ])
 
     def test_invalid_name(self):
-        self.assertRaises(ValueError, logging.getLogger, any)
+        self.assertRaises(TypeError, logging.getLogger, any)
 
 class BasicFilterTest(BaseTest):