diff options
author | louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13> | 2010-07-01 21:32:44 +0000 |
---|---|---|
committer | louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13> | 2010-07-01 21:32:44 +0000 |
commit | 33c291c9a945da009ab6849855dc3c66ecc103fa (patch) | |
tree | e2381d3dd80c4487d58e454a1d3c3e6685683367 /src/connection.py | |
parent | 450c234cd3c21032fe7dd10f754fbda0855ef2ac (diff) | |
download | poezio-33c291c9a945da009ab6849855dc3c66ecc103fa.tar.gz poezio-33c291c9a945da009ab6849855dc3c66ecc103fa.tar.bz2 poezio-33c291c9a945da009ab6849855dc3c66ecc103fa.tar.xz poezio-33c291c9a945da009ab6849855dc3c66ecc103fa.zip |
server on /join can be omitted, fixed #1525 Also reorganize various functions in common.py and update CHANGELOG
Diffstat (limited to 'src/connection.py')
-rw-r--r-- | src/connection.py | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/connection.py b/src/connection.py index 3b4e6e21..f24403a8 100644 --- a/src/connection.py +++ b/src/connection.py @@ -25,12 +25,13 @@ from gettext import (bindtextdomain, textdomain, bind_textdomain_codeset, gettext as _) import sys +import threading import xmpp from config import config from logging import logger from handler import Handler -import threading +from common import jid_get_node, jid_get_domain, is_jid_the_same class Connection(threading.Thread): """ @@ -194,20 +195,3 @@ class Connection(threading.Thread): if not connection: return self.handler.emit('send-time', iq_obj=iq) - -def jid_get_node(jid): - if isinstance(jid, basestring): - jid = xmpp.JID(jid) - return jid.getNode() - -def jid_get_domain(jid): - if isinstance(jid, basestring): - jid = xmpp.JID(jid) - return jid.getDomain() - -def is_jid_the_same(a, b): - if isinstance(a, basestring): - a = xmpp.JID(a) - if isinstance(b, basestring): - b = xmpp.JID(b) - return a.bareMatch(b) |