Merge pull request #358 from jqueuniet/add_next_method

Add a __next__ method to complete the iterator protocol

Author: Zach Moody

pynetbox/core/endpoint.py

@@ -133,7 +133,7 @@ def get(self, *args, **kwargs):
             key = None
 
         if not key:
-            return next(iter(self.filter(**kwargs)), None)
+            return next(self.filter(**kwargs), None)
 
         req = Request(
             key=key,
@@ -143,7 +143,7 @@ def get(self, *args, **kwargs):
             http_session=self.api.http_session,
         )
         try:
-            return next(iter(RecordSet(self, req)), None)
+            return next(RecordSet(self, req), None)
         except RequestError as e:
             if e.req.status_code == 404:
                 return None

pynetbox/core/response.py

@@ -78,11 +78,17 @@ def __init__(self, endpoint, request, **kwargs):
         self._response_cache = []
 
     def __iter__(self):
-        for i in self._response_cache:
-            yield self.endpoint.return_obj(i, self.endpoint.api, self.endpoint)
+        if self._response_cache:
+            yield self.endpoint.return_obj(
+                self._response_cache.pop(), self.endpoint.api, self.endpoint
+            )
         for i in self.response:
             yield self.endpoint.return_obj(i, self.endpoint.api, self.endpoint)
 
+    def __next__(self):
+        for i in self:
+            return i
+
     def __len__(self):
         try:
             return self.request.count