--- a/sat_tmp/wokkel/rsm.py	Tue Aug 13 18:58:08 2019 +0200
+++ b/sat_tmp/wokkel/rsm.py	Tue Aug 13 18:58:11 2019 +0200
@@ -28,7 +28,7 @@
 from twisted.words.xish import domish
 from twisted.words.protocols.jabber import error
 
-import pubsub
+from . import pubsub
 import copy
 
 
@@ -76,11 +76,11 @@
 
         if after is not None:
             assert before is None
-            assert isinstance(after, basestring)
+            assert isinstance(after, str)
         self.after = after
 
         if before is not None:
-            assert isinstance(before, basestring)
+            assert isinstance(before, str)
         self.before = before
 
     def __str__(self):
@@ -101,45 +101,45 @@
             set_elt = element
         else:
             try:
-                set_elt = element.elements(NS_RSM, 'set').next()
+                set_elt = next(element.elements(NS_RSM, 'set'))
             except StopIteration:
                 raise RSMNotFoundError()
 
         try:
-            before_elt = set_elt.elements(NS_RSM, 'before').next()
+            before_elt = next(set_elt.elements(NS_RSM, 'before'))
         except StopIteration:
             before = None
         else:
-            before = unicode(before_elt)
+            before = str(before_elt)
 
         try:
-            after_elt = set_elt.elements(NS_RSM, 'after').next()
+            after_elt = next(set_elt.elements(NS_RSM, 'after'))
         except StopIteration:
             after = None
         else:
-            after = unicode(after_elt)
+            after = str(after_elt)
             if not after:
                 raise RSMError("<after/> element can't be empty in RSM request")
 
         try:
-            max_elt = set_elt.elements(NS_RSM, 'max').next()
+            max_elt = next(set_elt.elements(NS_RSM, 'max'))
         except StopIteration:
             # FIXME: even if it doesn't make a lot of sense without it
             #        <max/> element is not mandatory in XEP-0059
             raise RSMError("RSM request is missing its 'max' element")
         else:
             try:
-                max_ = int(unicode(max_elt))
+                max_ = int(str(max_elt))
             except ValueError:
                 raise RSMError("bad value for 'max' element")
 
         try:
-            index_elt = set_elt.elements(NS_RSM, 'index').next()
+            index_elt = next(set_elt.elements(NS_RSM, 'index'))
         except StopIteration:
             index = None
         else:
             try:
-                index = int(unicode(index_elt))
+                index = int(str(index_elt))
             except ValueError:
                 raise RSMError("bad value for 'index' element")
 
@@ -152,10 +152,10 @@
         @rtype: L{domish.Element}
         """
         set_elt = domish.Element((NS_RSM, 'set'))
-        set_elt.addElement('max', content=unicode(self.max))
+        set_elt.addElement('max', content=str(self.max))
 
         if self.index is not None:
-            set_elt.addElement('index', content=unicode(self.index))
+            set_elt.addElement('index', content=str(self.index))
 
         if self.before is not None:
             if self.before == '':  # request the last page
@@ -231,17 +231,17 @@
         @rtype: L{RSMResponse}
         """
         try:
-            set_elt = element.elements(NS_RSM, 'set').next()
+            set_elt = next(element.elements(NS_RSM, 'set'))
         except StopIteration:
             raise RSMNotFoundError()
 
         try:
-            first_elt = set_elt.elements(NS_RSM, 'first').next()
+            first_elt = next(set_elt.elements(NS_RSM, 'first'))
         except StopIteration:
             first = None
             index = None
         else:
-            first = unicode(first_elt)
+            first = str(first_elt)
             try:
                 index = int(first_elt['index'])
             except KeyError:
@@ -250,7 +250,7 @@
                 raise RSMError("bad index in RSM response")
 
         try:
-            last_elt = set_elt.elements(NS_RSM, 'last').next()
+            last_elt = next(set_elt.elements(NS_RSM, 'last'))
         except StopIteration:
             if first is not None:
                 raise RSMError("RSM response is missing its 'last' element")
@@ -259,15 +259,15 @@
         else:
             if first is None:
                 raise RSMError("RSM response is missing its 'first' element")
-            last = unicode(last_elt)
+            last = str(last_elt)
 
         try:
-            count_elt = set_elt.elements(NS_RSM, 'count').next()
+            count_elt = next(set_elt.elements(NS_RSM, 'count'))
         except StopIteration:
             count = None
         else:
             try:
-                count = int(unicode(count_elt))
+                count = int(str(count_elt))
             except ValueError:
                 raise RSMError("invalid count in RSM response")
 
@@ -283,12 +283,12 @@
         if self.first is not None:
             first_elt = set_elt.addElement('first', content=self.first)
             if self.index is not None:
-                first_elt['index'] = unicode(self.index)
+                first_elt['index'] = str(self.index)
 
             set_elt.addElement('last', content=self.last)
 
         if self.count is not None:
-            set_elt.addElement('count', content=unicode(self.count))
+            set_elt.addElement('count', content=str(self.count))
 
         return set_elt
 
@@ -315,7 +315,7 @@
         for attr in ('first', 'last', 'index', 'count'):
             value = getattr(self, attr)
             if value is not None:
-                result[attr] = unicode(value)
+                result[attr] = str(value)
         return result