Fixes to remove remaining cursor references

Author: technige

examples/test_examples.py

@@ -110,44 +110,43 @@ def test_statement_without_parameters(self):
         result.discard()
         session.close()
 
-    def test_result_cursor(self):
+    def test_result_traversal(self):
         driver = GraphDatabase.driver("bolt://localhost", auth=auth_token)
         session = driver.session()
-        # tag::result-cursor[]
-        search_term = "hammer"
-        result = session.run("MATCH (tool:Tool) WHERE tool.name CONTAINS {term} "
-                             "RETURN tool.name", {"term": search_term})
-        print("List of tools called %r:" % search_term)
+        # tag::result-traversal[]
+        search_term = "sword"
+        result = session.run("MATCH (weapon:Weapon) WHERE weapon.name CONTAINS {term} "
+                             "RETURN weapon.name", {"term": search_term})
+        print("List of weapons called %r:" % search_term)
         for record in result:
-            print(record["tool.name"])
-        # end::result-cursor[]
+            print(record["weapon.name"])
+        # end::result-traversal[]
         session.close()
 
-    def test_cursor_nesting(self):
+    def test_result_retention(self):
         driver = GraphDatabase.driver("bolt://localhost", auth=auth_token)
+        # tag::retain-result[]
         session = driver.session()
-        # tag::retain-result-query[]
         result = session.run("MATCH (knight:Person:Knight) WHERE knight.castle = {castle} "
-                             "RETURN id(knight) AS knight_id", {"castle": "Camelot"})
-        for record in result:
-            session.run("MATCH (knight) WHERE id(knight) = {id} "
-                        "MATCH (king:Person) WHERE king.name = {king} "
-                        "CREATE (knight)-[:DEFENDS]->(king)", {"id": record["knight_id"], "king": "Arthur"})
-        # end::retain-result-query[]
+                             "RETURN knight.name AS name", {"castle": "Camelot"})
+        retained_result = list(result)
         session.close()
+        for record in retained_result:
+            print("%s is a knight of Camelot" % record["name"])
+        # end::retain-result[]
+        assert isinstance(retained_result, list)
 
-    def test_result_retention(self):
+    def test_nested_statements(self):
         driver = GraphDatabase.driver("bolt://localhost", auth=auth_token)
         session = driver.session()
-        # tag::retain-result-process[]
+        # tag::nested-statements[]
         result = session.run("MATCH (knight:Person:Knight) WHERE knight.castle = {castle} "
                              "RETURN id(knight) AS knight_id", {"castle": "Camelot"})
-        retained_result = list(result)
-        for record in retained_result:
+        for record in result:
             session.run("MATCH (knight) WHERE id(knight) = {id} "
                         "MATCH (king:Person) WHERE king.name = {king} "
                         "CREATE (knight)-[:DEFENDS]->(king)", {"id": record["knight_id"], "king": "Arthur"})
-        # end::retain-result-process[]
+        # end::nested-statements[]
         session.close()
 
     def test_transaction_commit(self):

neo4j/v1/session.py

@@ -165,7 +165,7 @@ class StatementResult(object):
     def __init__(self, connection, run_response, pull_all_response):
         super(StatementResult, self).__init__()
 
-        # The Connection instance behind this cursor.
+        # The Connection instance behind this result.
         self.connection = connection
 
         # The keys for the records in the result stream. These are
@@ -229,7 +229,7 @@ def keys(self):
 
     def discard(self):
         """ Consume the remainder of this result and detach the connection
-        from this cursor.
+        from this result.
         """
         if self.connection and not self.connection.closed:
             fetch = self.connection.fetch
@@ -456,16 +456,16 @@ def run(self, statement, parameters=None):
 
         run_response = Response(self.connection)
         pull_all_response = Response(self.connection)
-        cursor = StatementResult(self.connection, run_response, pull_all_response)
-        cursor.statement = statement
-        cursor.parameters = parameters
+        result = StatementResult(self.connection, run_response, pull_all_response)
+        result.statement = statement
+        result.parameters = parameters
 
         self.connection.append(RUN, (statement, parameters), response=run_response)
         self.connection.append(PULL_ALL, response=pull_all_response)
         self.connection.send()
 
-        self.last_result = cursor
-        return cursor
+        self.last_result = result
+        return result
 
     def close(self):
         """ Recycle this session through the driver it came from.