From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 7 Nov 2011 10:13:18 +0000 (+0000)
Subject: Closes #13361: Raise correct exception type.
X-Git-Tag: v2.7.3rc1~315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53703d9d72c4b48a8c602209c4e4aba15f48d238;p=python

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

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index a0c4cb7233..dad69aebca 100644
--- 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 b2d0a2bda6..2aac3603dc 100644
--- 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):