Changeset 203:7f8f69adf13b

Timestamp:

Oct 3, 2016, 8:49:10 AM (6 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

rebase_source:

a651e00ec42e4970683d971de34fb89406b9ff66

Message:

imported patch py3-xmppim.patch

Location:

wokkel

Files:

• test/test_xmppim.py (modified) (3 diffs)
• xmppim.py (modified) (5 diffs)

wokkel/test/test_xmppim.py

@@ -6 +6 @@
 """
 
+from __future__ import division, absolute_import
+
 from twisted.internet import defer
 from twisted.trial import unittest
+from twisted.python.compat import unicode
 from twisted.words.protocols.jabber import error
 from twisted.words.protocols.jabber.jid import JID
@@ -897 +900 @@
         element = request.toElement()
         children = element.elements()
-        child = children.next()
+        child = next(children)
         self.assertEqual(NS_ROSTER, child.uri)
         self.assertEqual('query', child.name)
@@ -910 +913 @@
         element = request.toElement()
         children = element.query.elements()
-        child = children.next()
+        child = next(children)
         self.assertEqual(NS_ROSTER, child.uri)
         self.assertEqual('item', child.name)

wokkel/xmppim.py

@@ -11 +11 @@
 """
 
+from __future__ import division, absolute_import
+
 import warnings
 
 from twisted.internet import defer
+from twisted.python.compat import iteritems, itervalues, unicode
 from twisted.words.protocols.jabber import error
 from twisted.words.protocols.jabber.jid import JID
@@ -46 +49 @@
 
         if statuses is not None:
-            for lang, status in statuses.iteritems():
+            for lang, status in iteritems(statuses):
                 s = self.addElement('status', content=status)
                 if lang:
@@ -59 +62 @@
 
         if statuses is not None:
-            for lang, status in statuses.iteritems():
+            for lang, status in iteritems(statuses):
                 s = self.addElement('status', content=status)
                 if lang:
@@ -307 +310 @@
             return self.statuses[None]
         elif self.statuses:
-            for status in self.status.itervalues():
+            for status in itervalues(self.status):
                 return status
         else:
@@ -353 +356 @@
                 presence.addElement('priority', content=unicode(self.priority))
 
-        for lang, text in self.statuses.iteritems():
+        for lang, text in iteritems(self.statuses):
             status = presence.addElement('status', content=text)
             if lang: