mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge with 3.5

Browse source
This commit is contained in:
Georg Brandl 2016-02-25 20:18:00 +01:00
commit 6d6dd73aec
10 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/logging/__init__.py
View file

@ -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.
"""