summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2015-03-18 08:49:57 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2015-03-18 08:49:57 (GMT)
commit3505bd82a9b6a06ca4d97b2386c8da167b387743 (patch)
treef3e86b9798fbd1e407d63a8280852937d0b09900 /Lib/logging
parente42ccd2bfd7a05a02c1020b819e4ee5b26041d01 (diff)
parentd55436ace3cb908e0f7a1f368a2cd8879175947d (diff)
downloadcpython-3505bd82a9b6a06ca4d97b2386c8da167b387743.zip
cpython-3505bd82a9b6a06ca4d97b2386c8da167b387743.tar.gz
cpython-3505bd82a9b6a06ca4d97b2386c8da167b387743.tar.bz2
Issue #23207: merged fix from 3.4.
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index b1dc319..4942147 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1734,8 +1734,8 @@ def basicConfig(**kwargs):
"specified together with 'handlers'")
if handlers is None:
filename = kwargs.pop("filename", None)
+ mode = kwargs.pop("filemode", 'a')
if filename:
- mode = kwargs.pop("filemode", 'a')
h = FileHandler(filename, mode)
else:
stream = kwargs.pop("stream", None)