summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2011-08-18 00:59:27 -0700
committerNathan Fritz <fritzy@netflint.net>2011-08-18 00:59:27 -0700
commitfb78bf0996f8412a93cc53240fb55f16212105dc (patch)
treeb7069070e96bea14eb18a8654c095bc0101379f7
parentcd7cd30b4c5c46c4912db2970993bcd5160a36eb (diff)
downloadslixmpp-fb78bf0996f8412a93cc53240fb55f16212105dc.tar.gz
slixmpp-fb78bf0996f8412a93cc53240fb55f16212105dc.tar.bz2
slixmpp-fb78bf0996f8412a93cc53240fb55f16212105dc.tar.xz
slixmpp-fb78bf0996f8412a93cc53240fb55f16212105dc.zip
fixed manual address definition
-rw-r--r--examples/roster_browser.py2
-rw-r--r--sleekxmpp/clientxmpp.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/roster_browser.py b/examples/roster_browser.py
index d699d3cb..a428324e 100644
--- a/examples/roster_browser.py
+++ b/examples/roster_browser.py
@@ -143,7 +143,7 @@ if __name__ == '__main__':
format='%(levelname)-8s %(message)s')
if opts.jid is None:
- opts.jid = input("Username: ")
+ opts.jid = raw_input("Username: ")
if opts.password is None:
opts.password = getpass.getpass("Password: ")
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 3536e8e9..2e81eb3b 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -134,7 +134,8 @@ class ClientXMPP(BaseXMPP):
connection. Defaults to True.
"""
self.session_started_event.clear()
- address = (self.boundjid.host, 5222)
+ if not address:
+ address = (self.boundjid.host, 5222)
return XMLStream.connect(self, address[0], address[1],
use_tls=use_tls, reattempt=reattempt)