aboutsummaryrefslogtreecommitdiffstats
path: root/server/server.py
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2012-01-16 23:23:36 -0500
committerGuillaume Horel <guillaume.horel@gmail.com>2012-01-16 23:23:36 -0500
commit18ac8babb1d40b291468058d9125a1598434f543 (patch)
tree2f240b432003ad6299332fcfff0285370a51d458 /server/server.py
parent67ac29115c84b447d0fddef406ba591691d069ef (diff)
downloadalias-18ac8babb1d40b291468058d9125a1598434f543.tar.gz
Fixes to support sleekxmpp 1.0
Diffstat (limited to 'server/server.py')
-rw-r--r--server/server.py8
1 files changed, 7 insertions, 1 deletions
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))