summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-11-07 08:53:03 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-11-07 08:53:03 (GMT)
commit61b787e6dd00b1e6e24a12e2d5aa6e9fd1352663 (patch)
tree981feaa3df0b277dedf87a46144ae6d149c52d13 /Lib
parentebfaabd66373941e69a0b29589645857e0a6ccfc (diff)
downloadcpython-61b787e6dd00b1e6e24a12e2d5aa6e9fd1352663.zip
cpython-61b787e6dd00b1e6e24a12e2d5aa6e9fd1352663.tar.gz
cpython-61b787e6dd00b1e6e24a12e2d5aa6e9fd1352663.tar.bz2
Closes #13661: Check added for type of logger name.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/logging/__init__.py2
-rw-r--r--Lib/test/test_logging.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index de5392b..bea290e 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1094,6 +1094,8 @@ class Manager(object):
placeholder to now point to the logger.
"""
rv = None
+ if not isinstance(name, str):
+ raise ValueError('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 90d293e..a022680 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -293,6 +293,8 @@ class BuiltinLevelsTest(BaseTest):
('INF.BADPARENT', 'INFO', '4'),
])
+ def test_invalid_name(self):
+ self.assertRaises(ValueError, logging.getLogger, any)
class BasicFilterTest(BaseTest):