Move PlayerXmppPlugin to stanzas

Also remove PlayerXmppPlugin from echelon, as it apparently wasn't used
there.

xpartamupp/echelon.py

@@ -21,7 +21,7 @@
 
 import sleekxmpp
 from sleekxmpp.stanza import Iq
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin, ET
+from sleekxmpp.xmlstream import register_stanza_plugin
 from sleekxmpp.xmlstream.handler import Callback
 from sleekxmpp.xmlstream.matcher import StanzaPath
 import sqlalchemy
@@ -477,24 +477,6 @@ def get_num_players(raw_game_report):
         return -1
 
 
-class PlayerXmppPlugin(ElementBase):
-    """Class for custom player stanza extension."""
-
-    name = 'query'
-    namespace = 'jabber:iq:player'
-    interfaces = {'game', 'online'}
-    sub_interfaces = interfaces
-    plugin_attrib = 'player'
-
-    def add_player_online(self, player):
-        """Add a player to the extension.
-
-        Arguments:
-            player (str): JID of the player to add
-        """
-        self.xml.append(ET.fromstring("<player>%s</player>" % player))
-
-
 class EcheLOn(sleekxmpp.ClientXMPP):
     """Main class which handles IQ data and sends new data."""
 
@@ -511,7 +493,6 @@ def __init__(self, sjid, password, room, nick):
         # stanza
         self.nicks = {}
 
-        register_stanza_plugin(Iq, PlayerXmppPlugin)
         register_stanza_plugin(Iq, BoardListXmppPlugin)
         register_stanza_plugin(Iq, GameReportXmppPlugin)
         register_stanza_plugin(Iq, ProfileXmppPlugin)

xpartamupp/stanzas.py

@@ -112,6 +112,25 @@ def get_game(self):
         return data
 
 
+class PlayerXmppPlugin(ElementBase):
+    """Class for custom player stanza extension."""
+
+    name = 'query'
+    namespace = 'jabber:iq:player'
+    interfaces = {'online'}
+    sub_interfaces = interfaces
+    plugin_attrib = 'player'
+
+    def add_player_online(self, player):
+        """Add a player to the extension.
+
+        Arguments:
+            player (str): JID of the player to add
+
+        """
+        self.xml.append(ET.fromstring("<online>%s</online>" % player))
+
+
 class ProfileXmppPlugin(ElementBase):
     """Class for custom profile."""
 

xpartamupp/xpartamupp.py

@@ -22,12 +22,12 @@
 
 import sleekxmpp
 from sleekxmpp.stanza import Iq
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin, ET
+from sleekxmpp.xmlstream import register_stanza_plugin
 from sleekxmpp.xmlstream.handler import Callback
 from sleekxmpp.xmlstream.matcher import StanzaPath
 
 from xpartamupp.stanzas import (BoardListXmppPlugin, GameListXmppPlugin, GameReportXmppPlugin,
-                                ProfileXmppPlugin)
+                                PlayerXmppPlugin, ProfileXmppPlugin)
 
 
 class Games(object):
@@ -92,25 +92,6 @@ def change_game_state(self, jid, data):
                 self.games[jid]['startTime'] = str(round(time.time()))
 
 
-class PlayerXmppPlugin(ElementBase):
-    """Class for custom player stanza extension."""
-
-    name = 'query'
-    namespace = 'jabber:iq:player'
-    interfaces = {'online'}
-    sub_interfaces = interfaces
-    plugin_attrib = 'player'
-
-    def add_player_online(self, player):
-        """Add a player to the extension.
-
-        Arguments:
-            player (str): JID of the player to add
-
-        """
-        self.xml.append(ET.fromstring("<online>%s</online>" % player))
-
-
 class XpartaMuPP(sleekxmpp.ClientXMPP):
     """Main class which handles IQ data and sends new data."""