Clean up loop and don't catch RestExceptions

kyleconroy · kyleconroy · commit dafa11cd63ef · 2012-06-19T13:55:32.000-07:00
diff --git a/twilio/rest/resources.py b/twilio/rest/resources.py
@@ -357,27 +357,23 @@ def iter(self, **kwargs):
         """
         Return all instance resources using an iterator
         """
-        next_uri = self.uri
         params = transform_params(kwargs)
 
-        while next_uri:
-            try:
-                resp, page = self.request("GET", next_uri, params=params)
-
-                if self.key not in page:
-                    raise StopIteration()
+        while True:
+            resp, page = self.request("GET", self.uri, params=params)
 
-                for ir in page[self.key]:
-                    yield self.load_instance(ir)
+            if self.key not in page:
+                raise StopIteration()
 
-                if not page.get('next_page_uri', ''):
-                    raise StopIteration()
+            for ir in page[self.key]:
+                yield self.load_instance(ir)
 
-                o = urlparse(page['next_page_uri'])
-                params.update(parse_qs(o.query))
-            except TwilioRestException:
+            if not page.get('next_page_uri', ''):
                 raise StopIteration()
 
+            o = urlparse(page['next_page_uri'])
+            params.update(parse_qs(o.query))
+
 
     def load_instance(self, data):
         instance = self.instance(self, data[self.instance.id_key])
