From: Aaron Hill <aa1ronham@gmail.com>
Date: Fri, 18 Apr 2014 23:35:10 +0000 (-0400)
Subject: Make IdIterator not dependent on the parser being used
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=32279128e438e4b54d2a832b4af8b2ff29873a7d;p=tweepy.git

Make IdIterator not dependent on the parser being used
---

diff --git a/tweepy/binder.py b/tweepy/binder.py
index b55dda0..fcc61ed 100644
--- a/tweepy/binder.py
+++ b/tweepy/binder.py
@@ -41,6 +41,7 @@ def bind_api(**config):
             self.retry_delay = kargs.pop('retry_delay', api.retry_delay)
             self.retry_errors = kargs.pop('retry_errors', api.retry_errors)
             self.wait_on_rate_limit = kargs.pop('wait_on_rate_limit', api.wait_on_rate_limit)
+            self.parser = kargs.pop('parser', api.parser)
             self.headers = kargs.pop('headers', {})
             self.build_parameters(args, kargs)
 
@@ -195,7 +196,7 @@ def bind_api(**config):
             self.api.last_response = resp
             if resp.status and not 200 <= resp.status < 300:
                 try:
-                    error_msg = self.api.parser.parse_error(resp.read())
+                    error_msg = self.parser.parse_error(resp.read())
                 except Exception:
                     error_msg = "Twitter error response: status code = %s" % resp.status
                 raise TweepError(error_msg, resp)
@@ -208,7 +209,8 @@ def bind_api(**config):
                     body = zipper.read()
                 except Exception as e:
                     raise TweepError('Failed to decompress data: %s' % e)
-            result = self.api.parser.parse(self, body)
+            
+            result = self.parser.parse(self, body)
 
             conn.close()
 
@@ -218,10 +220,13 @@ def bind_api(**config):
 
             return result
 
-    def _call(api, *args, **kargs):
+    def _call(api, create=False, *args, **kargs):
 
         method = APIMethod(api, args, kargs)
-        return method.execute()
+        if create:
+            return method
+        else:
+            return method.execute()
 
 
     # Set pagination mode
diff --git a/tweepy/cursor.py b/tweepy/cursor.py
index 8ba8221..1a08cd8 100644
--- a/tweepy/cursor.py
+++ b/tweepy/cursor.py
@@ -3,6 +3,7 @@
 # See LICENSE for details.
 
 from tweepy.error import TweepError
+from tweepy.parsers import ModelParser, RawParser
 
 class Cursor(object):
     """Pagination helper class"""
@@ -86,6 +87,7 @@ class IdIterator(BaseIterator):
         self.max_id = kargs.get('max_id')
         self.num_tweets = 0
         self.results = []
+        self.model_results = []
         self.index = 0
 
     def next(self):
@@ -94,21 +96,35 @@ class IdIterator(BaseIterator):
             raise StopIteration
 
         if self.index >= len(self.results) - 1:
-            data = self.method(max_id=self.max_id, *self.args, **self.kargs)
+            data = self.method(max_id=self.max_id, parser=RawParser(), *self.args, **self.kargs)
+
+            old_parser = self.method.__self__.parser
+            # Hack for models which expect ModelParser to be set
+            self.method.__self__.parser = ModelParser()
+
+            # This is a special invocation that returns the underlying
+            # APIMethod class
+            model = ModelParser().parse(self.method(create=True), data)
+            self.method.__self__.parser = old_parser
+
+            result = self.method.__self__.parser.parse(self.method(create=True), data)
+            
             if len(self.results) != 0:
                 self.index += 1
-            self.results.append(data)
+            self.results.append(result)
+            self.model_results.append(model)
         else:
             self.index += 1
-            data = self.results[self.index]
+            result = self.results[self.index]
+            model = self.model_results[self.index]
             
-        if len(data) == 0:
+        if len(result) == 0:
             raise StopIteration
         # TODO: Make this not dependant on the parser making max_id and
         # since_id available
-        self.max_id = data.max_id 
+        self.max_id = model.max_id 
         self.num_tweets += 1
-        return data
+        return result
 
     def prev(self):
         """Fetch a set of items with IDs greater than current set."""
@@ -122,7 +138,7 @@ class IdIterator(BaseIterator):
             raise StopIteration
 
         data = self.results[self.index]
-        self.max_id = data.max_id
+        self.max_id = self.model_results[self.index].max_id
         self.num_tweets += 1
         return data