From 0edeefd977775ecb1f6c8b114008532b4629041f Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Tue, 20 Sep 2016 16:12:59 +0900 Subject: BaseXMPP: Stop automatically enabling UserNick, and remove deprecated alias module. --- slixmpp/basexmpp.py | 2 -- slixmpp/stanza/nick.py | 17 ----------------- 2 files changed, 19 deletions(-) delete mode 100644 slixmpp/stanza/nick.py diff --git a/slixmpp/basexmpp.py b/slixmpp/basexmpp.py index 6ade0e3c..f603b72c 100644 --- a/slixmpp/basexmpp.py +++ b/slixmpp/basexmpp.py @@ -21,7 +21,6 @@ from slixmpp.exceptions import IqError, IqTimeout from slixmpp.stanza import Message, Presence, Iq, StreamError from slixmpp.stanza.roster import Roster -from slixmpp.stanza.nick import Nick from slixmpp.xmlstream import XMLStream, JID from slixmpp.xmlstream import ET, register_stanza_plugin @@ -194,7 +193,6 @@ class BaseXMPP(XMLStream): # Initialize a few default stanza plugins. register_stanza_plugin(Iq, Roster) - register_stanza_plugin(Message, Nick) def start_stream_handler(self, xml): """Save the stream ID once the streams have been established. diff --git a/slixmpp/stanza/nick.py b/slixmpp/stanza/nick.py deleted file mode 100644 index 3bb7d63d..00000000 --- a/slixmpp/stanza/nick.py +++ /dev/null @@ -1,17 +0,0 @@ -""" - Slixmpp: The Slick XMPP Library - Copyright (C) 2010 Nathanael C. Fritz - This file is part of Slixmpp. - - See the file LICENSE for copying permission. -""" - -# The nickname stanza has been moved to its own plugin, but the existing -# references are kept for backwards compatibility. - -from slixmpp.stanza import Message, Presence -from slixmpp.xmlstream import register_stanza_plugin -from slixmpp.plugins.xep_0172 import UserNick as Nick - -register_stanza_plugin(Message, Nick) -register_stanza_plugin(Presence, Nick) -- cgit v1.2.3