Merge branch 'master' into develop

fritzy · Aug 17, 2012 · ff28b0a · ff28b0a
2 parents a249f87 + 8a03bd7
commit ff28b0a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
@@ -68,7 +68,12 @@ def __init__(self, jid='', default_ns='jabber:client'):
         #: An identifier for the stream as given by the server.
         self.stream_id = None
 
-        #: The JabberID (JID) used by this connection.
+        #: The JabberID (JID) requested for this connection.
+        self.requested_jid = JID(jid)
+
+        #: The JabberID (JID) used by this connection,
+        #: as set after session binding. This may even be a
+        #: different bare JID than what was requested.
         self.boundjid = JID(jid)
 
         self._expected_server_name = self.boundjid.host

diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py
@@ -92,23 +92,23 @@ def _default_credentials(self, required_values, optional_values):
         values = required_values.union(optional_values)
         for value in values:
             if value == 'username':
-                result[value] = self.xmpp.boundjid.user
+                result[value] = self.xmpp.requested_jid.user
             elif value == 'password':
                 result[value] = creds['password']
             elif value == 'authzid':
                 result[value] = creds.get('authzid', '')
             elif value == 'email':
-                jid = self.xmpp.boundjid.bare
+                jid = self.xmpp.requested_jid.bare
                 result[value] = creds.get('email', jid)
             elif value == 'channel_binding':
                 if sys.version_info >= (3, 3):
                     result[value] = self.xmpp.socket.get_channel_binding()
                 else:
                     result[value] = None
             elif value == 'host':
-                result[value] = self.xmpp.boundjid.domain
+                result[value] = self.xmpp.requested_jid.domain
             elif value == 'realm':
-                result[value] = self.xmpp.boundjid.domain
+                result[value] = self.xmpp.requested_jid.domain
             elif value == 'service-name':
                 result[value] = self.xmpp._service_name
             elif value == 'service':