Merge lp:~robru/gwibber/fix-rate-limiter into lp:~barry/gwibber/py3

[Robert Bruce Park]

Barry, looks like you made a mock that didn't perfectly reflect reality, and then the code you wrote against it passed the test but broke in reality ;-)

So here's a little fixup for that, making the mock reflect reality and fixing the code to pass both the test, and the real world.

[lp:~robru/gwibber/fix-rate-limiter]

1449. By Robert Bruce Park on 2012-10-05

Rebase barry's Facebook branch onto the updated py3 branch.

Includes schema fixups for the tests in other protocols. Also,
'debug_live.py facebook receive' is confirmed to be working.

[Barry Warsaw (barry)]

On Oct 05, 2012, at 06:03 PM, Robert Bruce Park wrote:

>Barry, looks like you made a mock that didn't perfectly reflect reality, and
>then the code you wrote against it passed the test but broke in reality ;-)
>
>So here's a little fixup for that, making the mock reflect reality and fixing
>the code to pass both the test, and the real world.

Good catch, thanks!

=== modified file 'gwibber/gwibber/protocols/twitter.py'
--- gwibber/gwibber/protocols/twitter.py	2012-10-05 12:50:57 +0000
+++ gwibber/gwibber/protocols/twitter.py	2012-10-05 18:02:27 +0000
@@ -326,7 +326,7 @@
 
     def update(self, response):
         info = response.info()
-        url = self._sanitize_url(info.geturl())
+        url = self._sanitize_url(response.geturl())
         # This is time in the future, in UTC epoch seconds, at which the
         # current rate limiting window expires.
         rate_reset = info.get('X-Rate-Limit-Reset')

=== modified file 'gwibber/gwibber/testing/mocks.py'
--- gwibber/gwibber/testing/mocks.py	2012-10-05 01:19:29 +0000
+++ gwibber/gwibber/testing/mocks.py	2012-10-05 18:02:27 +0000
@@ -86,12 +86,6 @@
         class FakeInfo:
             def __init__(self, headers):
                 self.headers = headers
-            def geturl(self):
-                if isinstance(url, str):
-                    return url
-                else:
-                    # Must be a Request object.
-                    return url.full_url
             def get(self, key, default=None):
                 return self.headers.get(key, default)
             def get_content_charset(self):
@@ -103,6 +97,12 @@
                 self.headers = headers
             def read(self):
                 return self._data
+            def geturl(self):
+                if isinstance(url, str):
+                    return url
+                else:
+                    # Must be a Request object.
+                    return url.full_url
             def __enter__(self):
                 return self
             def __exit__(self, *args, **kws):