summaryrefslogtreecommitdiffstats
path: root/Lib/logging/__init__.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2016-02-25 19:18:00 (GMT)
committerGeorg Brandl <georg@python.org>2016-02-25 19:18:00 (GMT)
commit6d6dd73aec5d594aefa9256999dbe2aab2caf06c (patch)
tree6b9f184720d010aa68bdca621b2f4df19ce74601 /Lib/logging/__init__.py
parent057ab49a6b377f14191027b36158a63d063273af (diff)
parent8c16cb9f65bfc7d732bc6bd3f533856795a95690 (diff)
downloadcpython-6d6dd73aec5d594aefa9256999dbe2aab2caf06c.zip
cpython-6d6dd73aec5d594aefa9256999dbe2aab2caf06c.tar.gz
cpython-6d6dd73aec5d594aefa9256999dbe2aab2caf06c.tar.bz2
merge with 3.5
Diffstat (limited to 'Lib/logging/__init__.py')
-rw-r--r--Lib/logging/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 369d2c3..f941f48 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -472,7 +472,7 @@ class Formatter(object):
use one of %-formatting, :meth:`str.format` (``{}``) formatting or
:class:`string.Template` formatting in your format string.
- .. versionchanged: 3.2
+ .. versionchanged:: 3.2
Added the ``style`` parameter.
"""
if style not in _STYLES:
@@ -701,7 +701,7 @@ class Filterer(object):
this and the record is then dropped. Returns a zero value if a record
is to be dropped, else non-zero.
- .. versionchanged: 3.2
+ .. versionchanged:: 3.2
Allow filters to be just callables.
"""