summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-11-07 08:53:58 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-11-07 08:53:58 (GMT)
commit39b53c50c4f0bbede11576e21a27fbb725176265 (patch)
treebb14a1d01f5b54b04d8680e0553016438ff2d503 /Lib/logging
parent50add0483638caf947c18712160b8579e5f741fc (diff)
parent61b787e6dd00b1e6e24a12e2d5aa6e9fd1352663 (diff)
downloadcpython-39b53c50c4f0bbede11576e21a27fbb725176265.zip
cpython-39b53c50c4f0bbede11576e21a27fbb725176265.tar.gz
cpython-39b53c50c4f0bbede11576e21a27fbb725176265.tar.bz2
Merged fix for #13361 from 3.2.
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index abc4b0c..c5988c9 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1096,6 +1096,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: