Changeset 50:b69ca8f7174e in ralphm-patches for roster_server.patch

Timestamp:

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

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Cleanup JIDs a bit more and adjust affected patches.

File:

• roster_server.patch (modified) (3 diffs)

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}
          """
 +