Changeset 50:b69ca8f7174e in ralphm-patches

Timestamp:

Jun 1, 2011, 9:29:29 AM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Cleanup JIDs a bit more and adjust affected patches.

Files:

• jid_cleanup.patch (modified) (10 diffs)
• roster_item.patch (modified) (15 diffs)
• roster_item_more.patch (modified) (4 diffs)
• roster_server.patch (modified) (3 diffs)

jid_cleanup.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent c91f18811c37c85486826a8e7916333ad769dce7
+# Parent 7d4897a32913c43d69e4b77db226714705ac5cd6
 
-diff -r c91f18811c37 wokkel/im.py
---- a/wokkel/im.py      Mon May 23 18:19:44 2011 +0200
-+++ b/wokkel/im.py      Wed May 25 09:36:06 2011 +0200
+diff -r 7d4897a32913 wokkel/im.py
+--- a/wokkel/im.py      Wed May 25 09:48:39 2011 +0200
++++ b/wokkel/im.py      Wed May 25 20:24:36 2011 +0200
 @@ -12,7 +12,7 @@
  All of it should eventually move to Twisted.
@@ -10 +10 @@
  
 -from twisted.words.protocols.jabber.jid import JID
-+from twisted.words.protocols.jabber.jid import JID, internJID
++from twisted.words.protocols.jabber import jid
  from twisted.words.xish import domish
  
@@ -19 +19 @@
              sent.
 -        @type recipient: {JID}
-+        @type recipient: L{JID}
++        @type recipient: L{jid.JID}
  
          @param show: Optional detailed presence information. One of C{'away'},
@@ -28 +28 @@
          @param recipient: Optional entity to which the presence should be sent.
 -        @type recipient: {JID}
-+        @type recipient: L{JID}
++        @type recipient: L{jid.JID}
  
          @param statuses: dictionary of natural language descriptions of the
@@ -37 +37 @@
          @param recipient: Entity to subscribe to.
 -        @type recipient: {JID}
-+        @type recipient: L{JID}
++        @type recipient: L{jid.JID}
          """
          presence = SubscriptionPresence(recipient=recipient, sender=sender)
@@ -46 +46 @@
          @param recipient: Entity to unsubscribe from.
 -        @type recipient: {JID}
-+        @type recipient: L{JID}
++        @type recipient: L{jid.JID}
          """
          presence = SubscriptionPresence(recipient=recipient, sender=sender)
@@ -55 +55 @@
          @param recipient: Entity that subscribed.
 -        @type recipient: {JID}
-+        @type recipient: L{JID}
++        @type recipient: L{jid.JID}
          """
          presence = SubscriptionPresence(recipient=recipient, sender=sender)
@@ -64 +64 @@
          @param recipient: Entity that unsubscribed.
 -        @type recipient: {JID}
-+        @type recipient: L{JID}
++        @type recipient: L{jid.JID}
          """
          presence = SubscriptionPresence(recipient=recipient, sender=sender)
@@ -73 +73 @@
          @param recipient: Entity to be probed.
 -        @type recipient: {JID}
-+        @type recipient: L{JID}
++        @type recipient: L{jid.JID}
          """
          presence = ProbePresence(recipient=recipient, sender=sender)
          self.send(presence.toElement())
-@@ -389,7 +389,7 @@
+@@ -350,7 +350,7 @@
+     This represents one contact from an XMPP contact list known as roster.
+ 
+     @ivar jid: The JID of the contact.
+-    @type jid: L{JID}
++    @type jid: L{jid.JID}
+     @ivar name: The optional associated nickname for this contact.
+     @type name: C{unicode}
+     @ivar subscriptionTo: Subscription state to contact's presence. If C{True},
+@@ -389,8 +389,8 @@
  
  
      def _parseRosterItem(self, element):
 -        jid = JID(element['jid'])
-+        jid = internJID(element['jid'])
-         item = RosterItem(jid)
+-        item = RosterItem(jid)
++        entity = jid.internJID(element['jid'])
++        item = RosterItem(entity)
          item.name = element.getAttribute('name')
          subscription = element.getAttribute('subscription')
+         item.subscriptionTo = subscription in ('to', 'both')
+@@ -407,7 +407,7 @@
+         """
+         Retrieve contact list.
+ 
+-        @return: Roster as a mapping from L{JID} to L{RosterItem}.
++        @return: Roster as a mapping from L{jid.JID} to L{RosterItem}.
+         @rtype: L{twisted.internet.defer.Deferred}
+         """
+ 
 @@ -453,7 +453,7 @@
          itemElement = iq.query.item
@@ -91 +111 @@
          if unicode(itemElement['subscription']) == 'remove':
 -            self.onRosterRemove(JID(itemElement['jid']))
-+            self.onRosterRemove(internJID(itemElement['jid']))
++            self.onRosterRemove(jid.internJID(itemElement['jid']))
          else:
              item = self._parseRosterItem(iq.query.item)
              self.onRosterSet(item)
+@@ -473,5 +473,5 @@
+         Called when a roster push for the removal of an item was received.
+ 
+         @param entity: The entity for which the roster item has been removed.
+-        @type entity: L{JID}
++        @type entity: L{jid.JID}
+         """

roster_item.patch

@@ -1 @@
-diff -r c91f18811c37 wokkel/im.py
---- a/wokkel/im.py      Mon May 23 18:19:44 2011 +0200
-+++ b/wokkel/im.py      Wed May 25 09:24:29 2011 +0200
-@@ -7,21 +7,27 @@
+diff -r c103529d9f46 wokkel/im.py
+--- a/wokkel/im.py      Wed May 25 20:24:36 2011 +0200
++++ b/wokkel/im.py      Wed May 25 20:26:47 2011 +0200
+@@ -7,21 +7,25 @@
  XMPP IM protocol support.
  
@@ -12 +12 @@
  """
  
-+import warnings
-+
 +from twisted.internet import defer
- from twisted.words.protocols.jabber.jid import JID, internJID
+ from twisted.words.protocols.jabber import jid
 +from twisted.words.protocols.jabber import error
  from twisted.words.xish import domish
@@ -34 +32 @@
      """
      Stanza of kind presence.
-@@ -349,8 +355,8 @@
+@@ -349,8 +353,8 @@
  
      This represents one contact from an XMPP contact list known as roster.
  
 -    @ivar jid: The JID of the contact.
--    @type jid: L{JID}
+-    @type jid: L{jid.JID}
 +    @ivar entity: The JID of the contact.
-+    @type entity: L{JID}
++    @type entity: L{jid.JID}
      @ivar name: The optional associated nickname for this contact.
      @type name: C{unicode}
      @ivar subscriptionTo: Subscription state to contact's presence. If C{True},
-@@ -360,47 +366,126 @@
+@@ -360,47 +364,99 @@
      @ivar subscriptionFrom: Contact's subscription state. If C{True}, the
                              contact is subscribed to the presence information
@@ -87 +85 @@
 -class RosterClientProtocol(XMPPHandler):
 +
-+    def __getJID(self):
-+        warnings.warn("Use RosterItem.entity instead.", DeprecationWarning)
-+        return self.entity
-+
-+
-+    def __setJID(self, value):
-+        warnings.warn("Use RosterItem.entity instead.", DeprecationWarning)
-+        self.entity = value
-+
-+
-+    jid = property(__getJID, __setJID, doc="""
-+            JID of the contact. Deprecated in favour of C{entity}.""")
-+
-+
-+    def __getAsk(self):
-+        warnings.warn("Use RosterItem.pendingOut instead.", DeprecationWarning)
-+        return self.pendingOut
-+
-+
-+    def __setAsk(self, value):
-+        warnings.warn("Use RosterItem.pendingOut instead.", DeprecationWarning)
-+        self.pendingOut = value
-+
-+
-+    ask = property(__getAsk, __setAsk, doc="""
-+            Pending out subscription. Deprecated in favour of C{pendingOut}.""")
-+
-+
 +    def toElement(self):
 +        element = domish.Element((NS_ROSTER, 'item'))
@@ -146 +116 @@
 +    @classmethod
 +    def fromElement(Class, element):
-+        entity = internJID(element['jid'])
++        entity = jid.internJID(element['jid'])
 +        item = Class(entity)
 +        subscription = element.getAttribute('subscription')
@@ -178 +148 @@
 +    iqHandlers = {XPATH_ROSTER_SET: "_onRosterSet"}
 +
++
      def connectionInitialized(self):
 -        ROSTER_SET = "/iq[@type='set']/query[@xmlns='%s']" % NS_ROSTER
@@ -184 +155 @@
 -
 -    def _parseRosterItem(self, element):
--        jid = internJID(element['jid'])
--        item = RosterItem(jid)
+-        entity = jid.internJID(element['jid'])
+-        item = RosterItem(entity)
 -        item.name = element.getAttribute('name')
 -        subscription = element.getAttribute('subscription')
@@ -200 +171 @@
  
      def getRoster(self):
-@@ -415,8 +500,8 @@
+@@ -415,8 +471,8 @@
              roster = {}
              for element in domish.generateElementsQNamed(result.query.children,
@@ -211 +182 @@
              return roster
  
-@@ -437,32 +522,37 @@
+@@ -437,32 +493,36 @@
          """
          iq = IQ(self.xmlstream, 'set')
@@ -228 +199 @@
 -           iq.hasAttribute('from') and iq['from'] != self.xmlstream:
 -            return
--
--        iq.handled = True
 +        def eb(failure):
 +            failure.trap(RosterPushIgnored)
 +            raise error.StanzaError('service-unavailable')
  
-         itemElement = iq.query.item
+-        iq.handled = True
 +        item = RosterItem.fromElement(iq.query.item)
  
--        if unicode(itemElement['subscription']) == 'remove':
--            self.onRosterRemove(internJID(itemElement['jid']))
+-        itemElement = iq.query.item
 +        if item.remove:
 +            d = defer.maybeDeferred(self.onRosterRemove, item.entity)
-         else:
++        else:
++            d = defer.maybeDeferred(self.onRosterSet, item)
+ 
+-        if unicode(itemElement['subscription']) == 'remove':
+-            self.onRosterRemove(jid.internJID(itemElement['jid']))
+-        else:
 -            item = self._parseRosterItem(iq.query.item)
 -            self.onRosterSet(item)
-+            d = defer.maybeDeferred(self.onRosterSet, item)
-+
 +        d.addErrback(eb)
 +        return d
@@ -261 +232 @@
          @type item: L{RosterItem}
          """
-@@ -472,6 +562,10 @@
+@@ -472,6 +532,10 @@
          """
          Called when a roster push for the removal of an item was received.
@@ -270 +241 @@
 +
          @param entity: The entity for which the roster item has been removed.
-         @type entity: L{JID}
+         @type entity: L{jid.JID}
          """
-diff -r c91f18811c37 wokkel/test/test_im.py
---- a/wokkel/test/test_im.py    Mon May 23 18:19:44 2011 +0200
-+++ b/wokkel/test/test_im.py    Wed May 25 09:24:29 2011 +0200
+diff -r c103529d9f46 wokkel/test/test_im.py
+--- a/wokkel/test/test_im.py    Wed May 25 20:24:36 2011 +0200
++++ b/wokkel/test/test_im.py    Wed May 25 20:26:47 2011 +0200
 @@ -7,13 +7,14 @@
  
@@ -291 +262 @@
  NS_XML = 'http://www.w3.org/XML/1998/namespace'
  NS_ROSTER = 'jabber:iq:roster'
-@@ -389,23 +390,356 @@
+@@ -389,23 +390,305 @@
  
  
@@ -300 +271 @@
 +    Tests for L{im.RosterItem}.
 +    """
-+
-+    def test_jidDeprecationGet(self):
-+        """
-+        Getting the jid attribute works as entity and warns deprecation.
-+        """
-+        item = im.RosterItem(JID('user@example.org'))
-+        entity = self.assertWarns(DeprecationWarning,
-+                                  "Use RosterItem.entity instead.",
-+                                  im.__file__,
-+                                  getattr, item, 'jid')
-+        self.assertIdentical(entity, item.entity)
-+
-+
-+    def test_jidDeprecationSet(self):
-+        """
-+        Setting the jid attribute works as entity and warns deprecation.
-+        """
-+        item = im.RosterItem(JID('user@example.org'))
-+        entity = self.assertWarns(DeprecationWarning,
-+                                  "Use RosterItem.entity instead.",
-+                                  im.__file__,
-+                                  setattr, item, 'jid',
-+                                  JID('other@example.org'))
-+        self.assertEquals(JID('other@example.org'), item.entity)
-+
-+
-+    def test_askDeprecationGet(self):
-+        """
-+        Getting the ask attribute works as entity and warns deprecation.
-+        """
-+        item = im.RosterItem(JID('user@example.org'))
-+        item.pendingOut = True
-+        ask = self.assertWarns(DeprecationWarning,
-+                               "Use RosterItem.pendingOut instead.",
-+                               im.__file__,
-+                               getattr, item, 'ask')
-+        self.assertTrue(ask)
-+
-+
-+    def test_askDeprecationSet(self):
-+        """
-+        Setting the ask attribute works as entity and warns deprecation.
-+        """
-+        item = im.RosterItem(JID('user@example.org'))
-+        entity = self.assertWarns(DeprecationWarning,
-+                                  "Use RosterItem.pendingOut instead.",
-+                                  im.__file__,
-+                                  setattr, item, 'ask',
-+                                  True)
-+        self.assertTrue(item.pendingOut)
-+
 +
 +    def test_toElement(self):
@@ -653 +573 @@
          # Inspect outgoing iq request
  
-@@ -419,10 +753,117 @@
+@@ -419,10 +702,117 @@
          self.assertEquals(1, len(children))
          child = children[0]

roster_item_more.patch

@@ -1 +1 @@
 # HG changeset patch
-# Parent 542d8f19d4438edd7493773cb7a6e0d5e1581d0c
+# Parent 2741eaf2b765b6b175a9da29669c23ce13e2a14c
 
-diff -r 542d8f19d443 wokkel/im.py
---- a/wokkel/im.py      Wed May 25 09:37:04 2011 +0200
-+++ b/wokkel/im.py      Wed May 25 09:39:42 2011 +0200
-@@ -373,6 +373,12 @@
+diff -r 2741eaf2b765 wokkel/im.py
+--- a/wokkel/im.py      Wed May 25 20:26:47 2011 +0200
++++ b/wokkel/im.py      Wed May 25 20:27:04 2011 +0200
+@@ -371,6 +371,12 @@
      @ivar groups: Set of groups this contact is categorized in. Groups are
                    represented by an opaque identifier of type C{unicode}.
@@ -18 +18 @@
  
      __subscriptionStates = {(False, False): None,
-@@ -383,15 +389,17 @@
+@@ -381,15 +387,17 @@
      def __init__(self, entity, subscriptionTo=False, subscriptionFrom=False,
                         name=None, groups=None):
@@ -35 +35 @@
 +
  
-     def __getJID(self):
-         warnings.warn("Use RosterItem.entity instead.", DeprecationWarning)
-@@ -535,6 +543,8 @@
+     def toElement(self):
+         element = domish.Element((NS_ROSTER, 'item'))
+@@ -505,6 +513,8 @@
+             raise error.StanzaError('service-unavailable')
  
-         itemElement = iq.query.item
          item = RosterItem.fromElement(iq.query.item)
 +        if iq.hasAttribute('from'):
-+            item.sender = internJID(iq['from'])
++            item.sender = jid.internJID(iq['from'])
  
          if item.remove:
              d = defer.maybeDeferred(self.onRosterRemove, item.entity)
-diff -r 542d8f19d443 wokkel/test/test_im.py
---- a/wokkel/test/test_im.py    Wed May 25 09:37:04 2011 +0200
-+++ b/wokkel/test/test_im.py    Wed May 25 09:39:42 2011 +0200
-@@ -815,9 +815,9 @@
+diff -r 2741eaf2b765 wokkel/test/test_im.py
+--- a/wokkel/test/test_im.py    Wed May 25 20:26:47 2011 +0200
++++ b/wokkel/test/test_im.py    Wed May 25 20:27:04 2011 +0200
+@@ -764,9 +764,9 @@
          return d
  
@@ -61 +61 @@
          xml = """
            <iq type='set' from='bad@example.org'>
-@@ -841,6 +841,34 @@
+@@ -790,6 +790,34 @@
          return d
  

roster_server.patch

@@ -1 @@
-diff -r 3c5fb05162e1 wokkel/im.py
---- a/wokkel/im.py      Wed May 25 09:39:42 2011 +0200
-+++ b/wokkel/im.py      Wed May 25 09:40:28 2011 +0200
-@@ -14,7 +14,7 @@
+diff -r 05330d69e16c wokkel/im.py
+--- a/wokkel/im.py      Wed May 25 20:20:50 2011 +0200
++++ b/wokkel/im.py      Wed May 25 20:22:14 2011 +0200
+@@ -12,7 +12,7 @@
  
  from twisted.internet import defer
- from twisted.words.protocols.jabber.jid import JID, internJID
+ from twisted.words.protocols.jabber import jid
 -from twisted.words.protocols.jabber import error
 +from twisted.words.protocols.jabber import error, xmlstream
@@ -11 +11 @@
  
  from wokkel.compat import IQ
-@@ -25,6 +25,7 @@
+@@ -23,6 +23,7 @@
  NS_ROSTER = 'jabber:iq:roster'
  
@@ -19 +19 @@
  
  
-@@ -579,3 +580,43 @@
+@@ -550,3 +551,43 @@
          @param entity: The entity for which the roster item has been removed.
-         @type entity: L{JID}
+         @type entity: L{jid.JID}
          """
 +