[Python-checkins] cpython (2.7): Closes #13361: Raise correct exception type.
vinay.sajip
python-checkins at python.org
Mon Nov 7 11:16:12 CET 2011
http://hg.python.org/cpython/rev/60dd1568bbd1
changeset: 73418:60dd1568bbd1
branch: 2.7
parent: 73415:5f3b7528b144
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Mon Nov 07 10:13:18 2011 +0000
summary:
Closes #13361: Raise correct exception type.
files:
Lib/logging/__init__.py | 2 +-
Lib/test/test_logging.py | 2 +-
2 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
@@ -1008,7 +1008,7 @@
"""
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
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -273,7 +273,7 @@
])
def test_invalid_name(self):
- self.assertRaises(ValueError, logging.getLogger, any)
+ self.assertRaises(TypeError, logging.getLogger, any)
class BasicFilterTest(BaseTest):
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list