summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--poezio/connection.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/poezio/connection.py b/poezio/connection.py
index b04bf9fd..bbaf2e69 100644
--- a/poezio/connection.py
+++ b/poezio/connection.py
@@ -18,6 +18,7 @@ import base64
import random
import slixmpp
+from slixmpp import JID, InvalidJID
from slixmpp.xmlstream import ET
from slixmpp.plugins.xep_0184 import XEP_0184
from slixmpp.plugins.xep_0030 import DiscoInfo
@@ -26,7 +27,6 @@ from slixmpp.util import FileSystemCache
from poezio import common
from poezio import fixes
from poezio import xdg
-from poezio.common import safeJID
from poezio.config import config, options
@@ -81,7 +81,11 @@ class Connection(slixmpp.ClientXMPP):
self.anon = True
jid = config.get('server')
password = None
- jid = safeJID(jid)
+ try:
+ jid = JID(jid)
+ except InvalidJID:
+ sys.stderr.write('Invalid jid option: "%s" is not a valid JID\n' % jid)
+ sys.exit(1)
jid.resource = '%s-%s' % (
jid.resource,
device_id) if jid.resource else 'poezio-%s' % device_id