Bit of internal renaming

Author: technige

neo4j/v1/connection.py

@@ -221,7 +221,7 @@ def on_failure(metadata):
         self.append(INIT, (user_agent,), response=response)
         self.send()
         while not response.complete:
-            self.fetch_next()
+            self.fetch()
 
     def __del__(self):
         self.close()
@@ -255,9 +255,9 @@ def on_failure(metadata):
 
         self.append(RESET, response=response)
         self.send()
-        fetch_next = self.fetch_next
+        fetch = self.fetch
         while not response.complete:
-            fetch_next()
+            fetch()
 
     def send(self):
         """ Send all queued messages to the server.
@@ -268,7 +268,7 @@ def send(self):
             raise ProtocolError("Cannot write to a defunct connection")
         self.channel.send()
 
-    def fetch_next(self):
+    def fetch(self):
         """ Receive exactly one message from the server.
         """
         if self.closed:

neo4j/v1/session.py

@@ -132,7 +132,7 @@ def __init__(self, connection, statement, parameters):
         self._keys = None
         self._connection = connection
         self._current = None
-        self._next = deque()
+        self._record_buffer = deque()
         self._position = -1
         self._summary = None
         self._consumed = False
@@ -154,15 +154,15 @@ def next(self):
         """ Advance to the next record, if available, and return a boolean
         to indicate whether or not the cursor has moved.
         """
-        if self._next:
-            values = self._next.popleft()
+        if self._record_buffer:
+            values = self._record_buffer.popleft()
             self._current = Record(self.keys(), tuple(map(hydrated, values)))
             self._position += 1
             return True
         elif self._consumed:
             return False
         else:
-            self._connection.fetch_next()
+            self._connection.fetch()
             return self.next()
 
     def record(self):
@@ -179,12 +179,12 @@ def at_end(self):
         """ Return ``True`` if at the end of the record stream, ``False``
         otherwise.
         """
-        if self._next:
+        if self._record_buffer:
             return False
         elif self._consumed:
             return True
         else:
-            self._connection.fetch_next()
+            self._connection.fetch()
             return self.at_end()
 
     def stream(self):
@@ -204,7 +204,7 @@ def keys(self):
         """
         # Fetch messages until we have the header or a failure
         while self._keys is None and not self._consumed:
-            self._connection.fetch_next()
+            self._connection.fetch()
         return self._keys
 
     def get(self, item, default=None):
@@ -226,17 +226,17 @@ def summarize(self):
 
     def _consume(self):
         # Consume the remainder of this result, triggering all appropriate callback functions.
-        fetch_next = self._connection.fetch_next
+        fetch = self._connection.fetch
         while not self._consumed:
-            fetch_next()
+            fetch()
 
     def _on_header(self, metadata):
         # Called on receipt of the result header.
         self._keys = metadata["fields"]
 
     def _on_record(self, values):
         # Called on receipt of each result record.
-        self._next.append(values)
+        self._record_buffer.append(values)
 
     def _on_footer(self, metadata):
         # Called on receipt of the result footer.