r47099 - Merge rip-in-pepperoni-msn-8253: Remove MSN (twisted.words.protocols.msn)
hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Mon, 28 Mar 2016 22:31:09 -0600 (MDT)
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: hawkowl
Date: Mon Mar 28 22:31:03 2016
New Revision: 47099
Added:
trunk/twisted/words/topfiles/8253.removal
Removed:
trunk/docs/words/examples/msn_example.py
trunk/twisted/words/protocols/msn.py
trunk/twisted/words/test/test_msn.py
Modified:
trunk/docs/words/examples/index.rst
trunk/twisted/words/protocols/__init__.py
trunk/twisted/words/topfiles/README
Log:
Merge rip-in-pepperoni-msn-8253: Remove MSN (twisted.words.protocols.msn)
Author: hawkowl
Reviewer: adiroiban
Fixes: #8253
Modified: trunk/docs/words/examples/index.rst
==============================================================================
--- trunk/docs/words/examples/index.rst (original)
+++ trunk/docs/words/examples/index.rst Mon Mar 28 22:31:03 2016
@@ -8,7 +8,6 @@
- :download:`ircLogBot.py` - connects to an IRC server and logs all messages
- :download:`minchat.py` - log bot using twisted.im
-- :download:`msn_example.py`
- :download:`oscardemo.py`
- :download:`jabber_client.py`
- :download:`pb_client.py`
Modified: trunk/twisted/words/protocols/__init__.py
==============================================================================
--- trunk/twisted/words/protocols/__init__.py (original)
+++ trunk/twisted/words/protocols/__init__.py Mon Mar 28 22:31:03 2016
@@ -1,13 +1,6 @@
# Copyright (c) Twisted Matrix Laboratories.
# See LICENSE for details.
-
"""
Chat protocols.
"""
-
-from twisted.python import deprecate, versions
-
-deprecate.deprecatedModuleAttribute(
- versions.Version("Twisted", 15, 1, 0), "MSN has shutdown.", __name__,
- "msn")
Modified: trunk/twisted/words/topfiles/README
==============================================================================
--- trunk/twisted/words/topfiles/README (original)
+++ trunk/twisted/words/topfiles/README Mon Mar 28 22:31:03 2016
@@ -1,5 +1 @@
Twisted Words 16.0.0
-
-Twisted Words depends on Twisted Core and Twisted Web. The Twisted Web
-dependency is only necessary for MSN support. MSN support also requires HTTPS,
-and therefore pyOpenSSL (<http://launchpad.net/pyopenssl>).