Merge lp:~spiv/wrested/deferred-semaphore-tweak into lp:wrested

[Andrew Bennetts]

The intended API for DeferredSemaphore is to call its 'run' method, rather than acquire/release manually.

This is a quick untested tweak to do so.

[Martin Pool (mbp)]

great, thankyou

review: Approve

=== modified file 'wrested/__init__.py'
--- wrested/__init__.py	2011-03-05 02:37:10 +0000
+++ wrested/__init__.py	2011-04-09 02:25:46 +0000
@@ -70,17 +70,8 @@
         :returns: Deferred producing (response_metadata, body).
         """
         # print 'queue get of url %s' % url
-        def release(result):
-            self.throttle_semaphore.release()
-            return result
-        def can_proceed(ignored):
-            # print 'get url %s' % url    
-            d = self.browser.get(url, 
-                headers={'User-agent': 'wrested/0'})
-            d.addBoth(release)
-            return d
-        d = self.throttle_semaphore.acquire()
-        d.addCallback(can_proceed)
+        d = self.throttle_semaphore.run(
+            self.browser.get, url, headers={'User-agent': 'wrested/0'})
         d.addErrback(self.on_http_failure, url)
         return d