diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/alias_plugin.py | 8 | ||||
| -rw-r--r-- | server/component.py | 7 | ||||
| -rw-r--r-- | server/object.py | 8 | ||||
| -rw-r--r-- | server/server.py | 8 | ||||
| -rw-r--r-- | server/user.py | 2 |
5 files changed, 20 insertions, 13 deletions
diff --git a/server/alias_plugin.py b/server/alias_plugin.py index fb57bd8..77bcb5d 100644 --- a/server/alias_plugin.py +++ b/server/alias_plugin.py @@ -5,10 +5,10 @@ import hashlib from xml.etree import cElementTree as ET from sleekxmpp.xmlstream.stanzabase import ElementBase, register_stanza_plugin -from sleekxmpp.plugins import base +from sleekxmpp.plugins.base import base_plugin from sleekxmpp.xmlstream.handler.callback import Callback from sleekxmpp.xmlstream.matcher.xpath import MatchXPath -from sleekxmpp.stanza.iq import Iq +from sleekxmpp import Iq from object import ObjectReader, ObjectError from permission import PermissionError @@ -34,7 +34,7 @@ class AliasItem(ElementBase): plugin_attrib = 'item' interfaces = set(('node', 'permission', 'key')) -class AliasPlugin(base.base_plugin): +class AliasPlugin(base_plugin): def plugin_init(self): self.description = 'Plugin to handle alias queries' @@ -45,7 +45,7 @@ class AliasPlugin(base.base_plugin): self.handle_alias_query)) def post_init(self): - base.base_plugin.post_init(self) + base_plugin.post_init(self) self.xmpp.plugin['xep_0030'].add_feature("alias:query") def send_permission_error(self, iq, message): diff --git a/server/component.py b/server/component.py index 0163c7b..2ae12d7 100644 --- a/server/component.py +++ b/server/component.py @@ -1,3 +1,4 @@ +import sys import logging logger = logging.getLogger(__name__) from sleekxmpp.componentxmpp import ComponentXMPP @@ -13,7 +14,7 @@ class ObjectComponent(ComponentXMPP): self.register_plugin('xep_0077', module="xep_0077") self.register_plugin("AliasPlugin", module = "alias_plugin", pconfig = {'root': root}) self.add_event_handler("session_start", self.start) - self.add_event_handler("presence_probe", self.presence_probe) + #self.add_event_handler("presence_probe", self.presence_probe) self.add_event_handler("message", self.message) self.add_event_handler("changed_subscription", self.presence_subscription) self.userHandler = UserHandler(root) @@ -46,8 +47,8 @@ class ObjectComponent(ComponentXMPP): self.userHandler.unregister(userJID) logger.info('unregistering user {}'.format(userJID)) - def presence_probe(self, event): - self.send_presence(pto = event["from"].full) + #def presence_probe(self, event): + # self.send_presence(pto = event["from"].full) diff --git a/server/object.py b/server/object.py index 31de622..8dd91a2 100644 --- a/server/object.py +++ b/server/object.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -import StringIO +#import StringIO import hashlib -import sys -import os +#import sys +#import os import os.path -import fileinput +#import fileinput import logging logger = logging.getLogger(__name__) diff --git a/server/server.py b/server/server.py index 63ca778..4556fb8 100644 --- a/server/server.py +++ b/server/server.py @@ -8,6 +8,12 @@ from component import ObjectComponent import os.path import sys +if sys.version_info < (3, 0): + reload(sys) + sys.setdefaultencoding('utf8') +else: + raw_input = input + if __name__ == '__main__': commandline = ArgumentParser(description = 'Connect the alias \ component to a given server') @@ -86,6 +92,6 @@ if __name__ == '__main__': config.root) if component.connect(): logging.info('Component {} connected'.format(component.boundjid)) - component.process(False) + component.process(block=False) else: logging.error("Component {} couldn't connect".format(component.boundjid)) diff --git a/server/user.py b/server/user.py index 2909c16..f6800f9 100644 --- a/server/user.py +++ b/server/user.py @@ -35,7 +35,7 @@ class User: class UserHandler: - def __init__(self,root): + def __init__(self, root): self.root = root def get_user_list(self): |