remove old hacks against 2to3 (#3076)

This reverts e2fb491

Co-authored-by: Nicholas Car <[email protected]>

Author: a-detiste

rdflib/plugins/parsers/rdfxml.py

@@ -298,8 +298,7 @@ def document_element_start(
         self, name: Tuple[str, str], qname, attrs: AttributesImpl
     ) -> None:
         if name[0] and URIRef("".join(name)) == RDFVOC.RDF:
-            # Cheap hack so 2to3 doesn't turn it into __next__
-            next = getattr(self, "next")
+            next = self.next
             next.start = self.node_element_start
             next.end = self.node_element_end
         else:
@@ -316,8 +315,7 @@ def node_element_start(
         current = self.current
         absolutize = self.absolutize
 
-        # Cheap hack so 2to3 doesn't turn it into __next__
-        next = getattr(self, "next")
+        next = self.next
         next.start = self.property_element_start
         next.end = self.property_element_end
 
@@ -410,8 +408,7 @@ def property_element_start(
         current = self.current
         absolutize = self.absolutize
 
-        # Cheap hack so 2to3 doesn't turn it into __next__
-        next = getattr(self, "next")
+        next = self.next
         object: Optional[_ObjectType] = None
         current.data = None
         current.list = None

rdflib/plugins/stores/berkeleydb.py

@@ -428,8 +428,7 @@ def remove(  # type: ignore[override]
                 cursor = index.cursor(txn=txn)
                 try:
                     cursor.set_range(key)
-                    # Hack to stop 2to3 converting this to next(cursor)
-                    current = getattr(cursor, "next")()
+                    current = cursor.next
                 except db.DBNotFoundError:
                     current = None
                 cursor.close()
@@ -506,8 +505,7 @@ def triples(
             cursor = index.cursor(txn=txn)
             try:
                 cursor.set_range(key)
-                # Cheap hack so 2to3 doesn't convert to next(cursor)
-                current = getattr(cursor, "next")()
+                current = cursor.next
             except db.DBNotFoundError:
                 current = None
             cursor.close()
@@ -539,8 +537,7 @@ def __len__(self, context: Optional[_ContextType] = None) -> int:
             key, value = current
             if key.startswith(prefix):
                 count += 1
-                # Hack to stop 2to3 converting this to next(cursor)
-                current = getattr(cursor, "next")()
+                current = cursor.next
             else:
                 break
         cursor.close()
@@ -593,8 +590,7 @@ def namespaces(self) -> Generator[Tuple[str, URIRef], None, None]:
         while current:
             prefix, namespace = current
             results.append((prefix.decode("utf-8"), namespace.decode("utf-8")))
-            # Hack to stop 2to3 converting this to next(cursor)
-            current = getattr(cursor, "next")()
+            current = cursor.next
         cursor.close()
         for prefix, namespace in results:
             yield prefix, URIRef(namespace)
@@ -637,8 +633,7 @@ def contexts(
                 cursor = index.cursor()
                 try:
                     cursor.set_range(key)
-                    # Hack to stop 2to3 converting this to next(cursor)
-                    current = getattr(cursor, "next")()
+                    current = cursor.next
                 except db.DBNotFoundError:
                     current = None
                 cursor.close()