Cursor no longer indexable

Author: technige

examples/test_examples.py

@@ -157,8 +157,8 @@ def test_transaction_commit(self):
         tx.commit()
         # end::transaction-commit[]
         result = session.run("MATCH (p:Person {name: 'Guinevere'}) RETURN count(p)")
-        next(result)
-        assert result["count(p)"] == 1
+        record = next(result)
+        assert record["count(p)"] == 1
         assert result.at_end
         session.close()
 
@@ -171,8 +171,8 @@ def test_transaction_rollback(self):
         tx.rollback()
         # end::transaction-rollback[]
         result = session.run("MATCH (p:Person {name: 'Merlin'}) RETURN count(p)")
-        next(result)
-        assert result["count(p)"] == 0
+        record = next(result)
+        assert record["count(p)"] == 0
         assert result.at_end
         session.close()
 

neo4j/v1/session.py

@@ -185,12 +185,6 @@ def __next__(self):
     def __iter__(self):
         return self
 
-    def __getitem__(self, item):
-        current = self._current
-        if current is None:
-            raise TypeError("No current record")
-        return current[item]
-
     def is_open(self):
         """ Return ``True`` if this cursor is still open, ``False`` otherwise.
         """

test/test_session.py

@@ -341,8 +341,8 @@ def test_automatic_reset_after_failure(self):
                 session.run("X").close()
             except CypherError:
                 result = session.run("RETURN 1")
-                next(result)
-                assert result[0] == 1
+                record = next(result)
+                assert record[0] == 1
             else:
                 assert False, "A Cypher error should have occurred"
 
@@ -435,8 +435,8 @@ def test_can_commit_transaction(self):
 
             # Create a node
             result = tx.run("CREATE (a) RETURN id(a)")
-            next(result)
-            node_id = result[0]
+            record = next(result)
+            node_id = record[0]
             assert isinstance(node_id, int)
 
             # Update a property
@@ -448,18 +448,18 @@ def test_can_commit_transaction(self):
             # Check the property value
             result = session.run("MATCH (a) WHERE id(a) = {n} "
                                  "RETURN a.foo", {"n": node_id})
-            next(result)
-            foo = result[0]
-            assert foo == "bar"
+            record = next(result)
+            value = record[0]
+            assert value == "bar"
 
     def test_can_rollback_transaction(self):
         with GraphDatabase.driver("bolt://localhost", auth=auth_token).session() as session:
             tx = session.begin_transaction()
 
             # Create a node
             result = tx.run("CREATE (a) RETURN id(a)")
-            next(result)
-            node_id = result[0]
+            record = next(result)
+            node_id = record[0]
             assert isinstance(node_id, int)
 
             # Update a property
@@ -478,8 +478,8 @@ def test_can_commit_transaction_using_with_block(self):
             with session.begin_transaction() as tx:
                 # Create a node
                 result = tx.run("CREATE (a) RETURN id(a)")
-                next(result)
-                node_id = result[0]
+                record = next(result)
+                node_id = record[0]
                 assert isinstance(node_id, int)
 
                 # Update a property
@@ -491,17 +491,17 @@ def test_can_commit_transaction_using_with_block(self):
             # Check the property value
             result = session.run("MATCH (a) WHERE id(a) = {n} "
                                  "RETURN a.foo", {"n": node_id})
-            next(result)
-            foo = result[0]
-            assert foo == "bar"
+            record = next(result)
+            value = record[0]
+            assert value == "bar"
 
     def test_can_rollback_transaction_using_with_block(self):
         with GraphDatabase.driver("bolt://localhost", auth=auth_token).session() as session:
             with session.begin_transaction() as tx:
                 # Create a node
                 result = tx.run("CREATE (a) RETURN id(a)")
-                next(result)
-                node_id = result[0]
+                record = next(result)
+                node_id = record[0]
                 assert isinstance(node_id, int)
 
                 # Update a property