Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

Fix Don't process vCard avatars for MUC occupants caused TypeError

README.rst

@@ -45,7 +45,7 @@ The latest source code for SleekXMPP may be found on `Github
 ``develop`` branch.
 
 **Latest Release**
-    - `1.1.11 <http://github.com/fritzy/SleekXMPP/zipball/1.1.11>`_
+    - `1.2.5 <http://github.com/fritzy/SleekXMPP/zipball/1.2.5>`_
 
 **Develop Releases**
     - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_

setup.py

@@ -87,8 +87,8 @@ packages     = [ 'sleekxmpp',
                  'sleekxmpp/plugins/xep_0086',
                  'sleekxmpp/plugins/xep_0091',
                  'sleekxmpp/plugins/xep_0092',
-		 'sleekxmpp/plugins/xep_0095',
-		 'sleekxmpp/plugins/xep_0096',
+                 'sleekxmpp/plugins/xep_0095',
+                 'sleekxmpp/plugins/xep_0096',
                  'sleekxmpp/plugins/xep_0107',
                  'sleekxmpp/plugins/xep_0108',
                  'sleekxmpp/plugins/xep_0115',
@@ -119,6 +119,10 @@ packages     = [ 'sleekxmpp',
                  'sleekxmpp/plugins/xep_0308',
                  'sleekxmpp/plugins/xep_0313',
                  'sleekxmpp/plugins/xep_0319',
+                 'sleekxmpp/plugins/xep_0323',
+                 'sleekxmpp/plugins/xep_0323/stanza',
+                 'sleekxmpp/plugins/xep_0325',
+                 'sleekxmpp/plugins/xep_0325/stanza',
                  'sleekxmpp/plugins/google',
                  'sleekxmpp/plugins/google/gmail',
                  'sleekxmpp/plugins/google/auth',

sleekxmpp/clientxmpp.py

@@ -136,7 +136,7 @@ class ClientXMPP(BaseXMPP):
         be attempted. If that fails, the server user in the JID
         will be used.
 
-        :param address   -- A tuple containing the server's host and port.
+        :param address: A tuple containing the server's host and port.
         :param reattempt: If ``True``, repeat attempting to connect if an
                          error occurs. Defaults to ``True``.
         :param use_tls: Indicates if TLS should be used for the

sleekxmpp/plugins/xep_0045.py

@@ -304,7 +304,7 @@ class XEP_0045(BasePlugin):
             room), whereas affiliations are permanent (they last across groupchat
             sessions).
         """
-        if role not in ('outcast', 'member', 'admin', 'owner', 'none'):
+        if role not in ('moderator', 'participant', 'visitor', 'none'):
             raise TypeError
         query = ET.Element('{http://jabber.org/protocol/muc#admin}query')
         item = ET.Element('item', {'role':role, 'nick':nick})    

sleekxmpp/plugins/xep_0153/vcard_avatar.py

@@ -124,10 +124,12 @@ class XEP_0153(BasePlugin):
             log.debug('Could not retrieve vCard for %s' % jid)
 
     def _recv_presence(self, pres):
-        if pres['muc']['affiliation']:
-            # Don't process vCard avatars for MUC occupants
-            # since they all share the same bare JID.
-            return
+        try:
+            if pres['muc']['affiliation']:
+                # Don't process vCard avatars for MUC occupants
+                # since they all share the same bare JID.
+                return
+        except: pass    
 
         if not pres.match('presence/vcard_temp_update'):
             self.api['set_hash'](pres['from'], args=None)

sleekxmpp/stanza/iq.py

@@ -9,7 +9,7 @@
 from sleekxmpp.stanza.rootstanza import RootStanza
 from sleekxmpp.xmlstream import StanzaBase, ET
 from sleekxmpp.xmlstream.handler import Waiter, Callback
-from sleekxmpp.xmlstream.matcher import MatchIDSender
+from sleekxmpp.xmlstream.matcher import MatchIDSender, MatcherId
 from sleekxmpp.exceptions import IqTimeout, IqError
 
 
@@ -194,11 +194,14 @@ class Iq(RootStanza):
         if timeout is None:
             timeout = self.stream.response_timeout
 
-        criteria = {
-            'id': self['id'],
-            'self': self.stream.boundjid,
-            'peer': self['to']
-        }
+        if self.stream.session_bind_event.is_set():
+            matcher = MatchIDSender({
+                'id': self['id'],
+                'self': self.stream.boundjid,
+                'peer': self['to']
+            })
+        else:
+            matcher = MatcherId(self['id'])
 
         if callback is not None and self['type'] in ('get', 'set'):
             handler_name = 'IqCallback_%s' % self['id']
@@ -210,19 +213,19 @@ class Iq(RootStanza):
                                      self._fire_timeout,
                                      repeat=False)
                 handler = Callback(handler_name,
-                                   MatchIDSender(criteria),
+                                   matcher,
                                    self._handle_result,
                                    once=True)
             else:
                 handler = Callback(handler_name,
-                                   MatchIDSender(criteria),
+                                   matcher,
                                    callback,
                                    once=True)
             self.stream.register_handler(handler)
             StanzaBase.send(self, now=now)
             return handler_name
         elif block and self['type'] in ('get', 'set'):
-            waitfor = Waiter('IqWait_%s' % self['id'], MatchIDSender(criteria))
+            waitfor = Waiter('IqWait_%s' % self['id'], matcher)
             self.stream.register_handler(waitfor)
             StanzaBase.send(self, now=now)
             result = waitfor.wait(timeout)

sleekxmpp/test/sleektest.py

@@ -376,6 +376,7 @@ class SleekTest(unittest.TestCase):
         if skip:
             if socket != 'live':
                 # Mark send queue as usable
+                self.xmpp.session_bind_event.set()
                 self.xmpp.session_started_event.set()
                 # Clear startup stanzas
                 self.xmpp.socket.next_sent(timeout=1)

sleekxmpp/util/sasl/mechanisms.py

@@ -287,7 +287,9 @@ class SCRAM(Mech):
         if nonce[:len(self.cnonce)] != self.cnonce:
             raise SASLCancelled('Invalid nonce')
 
-        cbind_data = self.credentials['channel_binding']
+        cbind_data = b''
+        if self.use_channel_binding:
+            cbind_data = self.credentials['channel_binding']
         cbind_input = self.gs2_header + cbind_data
         channel_binding = b'c=' + b64encode(cbind_input).replace(b'\n', b'')
 

sleekxmpp/version.py

@@ -9,5 +9,5 @@
 # We don't want to have to import the entire library
 # just to get the version info for setup.py
 
-__version__ = '1.2.0'
-__version_info__ = (1, 2, 0, '', 0)
+__version__ = '1.2.5'
+__version_info__ = (1, 2, 5, '', 0)