Merge with 3.5

This commit is contained in:
Zachary Ware 2016-08-09 16:21:17 -05:00
commit 1aa913e134

View file

@ -155,7 +155,7 @@ exclusive locks - and so there is no need for such a handler. Furthermore,
for this value.
.. class:: WatchedFileHandler(filename[,mode[, encoding[, delay]]])
.. class:: WatchedFileHandler(filename, mode='a', encoding=None, delay=False)
Returns a new instance of the :class:`WatchedFileHandler` class. The specified
file is opened and used as the stream for logging. If *mode* is not specified,
@ -271,7 +271,7 @@ The :class:`RotatingFileHandler` class, located in the :mod:`logging.handlers`
module, supports rotation of disk log files.
.. class:: RotatingFileHandler(filename, mode='a', maxBytes=0, backupCount=0, encoding=None, delay=0)
.. class:: RotatingFileHandler(filename, mode='a', maxBytes=0, backupCount=0, encoding=None, delay=False)
Returns a new instance of the :class:`RotatingFileHandler` class. The specified
file is opened and used as the stream for logging. If *mode* is not specified,