r47083 - cleanup before merge
hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Sat, 26 Mar 2016 04:44:30 -0600 (MDT)
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: hawkowl
Date: Sat Mar 26 04:44:16 2016
New Revision: 47083
Modified:
branches/tlogger-twistd-8235/twisted/application/app.py
branches/tlogger-twistd-8235/twisted/test/test_twistd.py
branches/tlogger-twistd-8235/twisted/topfiles/8235.removal
Log:
cleanup before merge
Modified: branches/tlogger-twistd-8235/twisted/application/app.py
==============================================================================
--- branches/tlogger-twistd-8235/twisted/application/app.py (original)
+++ branches/tlogger-twistd-8235/twisted/application/app.py Sat Mar 26 04:44:16 2016
@@ -201,7 +201,7 @@
"not implement twisted.logger.ILogObserver or "
"twisted.python.log.ILogObserver to "
"twisted.application.app.AppLogger was deprecated in "
- "Twisted 16.1. Please use a factory that produces "
+ "Twisted 16.2. Please use a factory that produces "
"twisted.logger.ILogObserver (or the legacy "
"twisted.python.log.ILogObserver) implementing objects "
"instead."),
Modified: branches/tlogger-twistd-8235/twisted/test/test_twistd.py
==============================================================================
--- branches/tlogger-twistd-8235/twisted/test/test_twistd.py (original)
+++ branches/tlogger-twistd-8235/twisted/test/test_twistd.py Sat Mar 26 04:44:16 2016
@@ -1414,7 +1414,9 @@
def test_unmarkedObserversDeprecated(self):
"""
- L{app.AppLogger} using a logger observer which
+ L{app.AppLogger} using a logger observer which does not implement
+ L{ILogObserver} or L{LegacyILogObserver} will be wrapped in a compat
+ shim and raise a L{DeprecationWarning}.
"""
logs = []
logger = app.AppLogger({})
@@ -1431,7 +1433,7 @@
"which do not implement twisted.logger.ILogObserver "
"or twisted.python.log.ILogObserver to "
"twisted.application.app.AppLogger was deprecated "
- "in Twisted 16.1. Please use a factory that "
+ "in Twisted 16.2. Please use a factory that "
"produces twisted.logger.ILogObserver (or the "
"legacy twisted.python.log.ILogObserver) "
"implementing objects instead."))
Modified: branches/tlogger-twistd-8235/twisted/topfiles/8235.removal
==============================================================================
--- branches/tlogger-twistd-8235/twisted/topfiles/8235.removal (original)
+++ branches/tlogger-twistd-8235/twisted/topfiles/8235.removal Sat Mar 26 04:44:16 2016
@@ -1 +1 @@
-Passing a factory that produces legacy log observers (observers that implement twisted.python.log.ILogObserver) to twisted.application.app.AppLogger has been deprecated. This is primarily used by twistd's --logger option. Please use factories that produce log observers implementing twisted.logger.ILogObserver.
+Passing a factory that produces log observers that do not implement twisted.logger.ILogObserver or twisted.python.log.ILogObserver to twisted.application.app.AppLogger has been deprecated. This is primarily used by twistd's --logger option. Please use factories that produce log observers implementing twisted.logger.ILogObserver or the legacy twisted.python.log.ILogObserver.