Merge lp:~mbp/txrestfulclient/trivial into lp:txrestfulclient

[Martin Pool]

On maverick trying to create a new token fails as follows:

  File "/usr/lib/python2.6/dist-packages/twisted/internet/defer.py", line 891, in _inlineCallbacks
    result = result.throwExceptionIntoGenerator(g)
  File "/usr/lib/python2.6/dist-packages/twisted/python/failure.py", line 338, in throwExceptionIntoGenerator
    return g.throw(self.type, self.value, self.tb)
  File "examples/lp_print_me.py", line 32, in print_me
    service_root=EDGE_SERVICE_ROOT, cache=cache)
  File "/usr/lib/python2.6/dist-packages/twisted/internet/defer.py", line 441, in _runCallbacks
    self.result = callback(self.result, *args, **kw)
  File "/home/mbp/work/txrestfulclient/trunk/txrestfulclient/launchpad/__init__.py", line 166, in get_access_token
    credentials.exchange_request_token_for_access_token(web_root)
  File "/home/mbp/work/txrestfulclient/trunk/txrestfulclient/launchpad/credentials.py", line 112, in exchange_request_token_for_access_token
    data=urlencode(params))
  File "/usr/lib/python2.6/dist-packages/twisted/web/client.py", line 539, in getPage
    *args, **kwargs).deferred
  File "/usr/lib/python2.6/dist-packages/twisted/web/client.py", line 515, in _makeGetterFactory
    factory = factoryFactory(url, *args, **kwargs)
exceptions.TypeError: __init__() got an unexpected keyword argument 'data'

Perhaps it was renamed in twisted 10.1, or perhaps it never worked?

[lp:~mbp/txrestfulclient/trivial]

43. By Martin Pool on 2010-09-09

Turn on twisted debugging

44. By Martin Pool on 2010-09-09

Better message for RequestFailed exception

45. By Martin Pool on 2010-09-09

Must wait for access token to actually be obtained before using it

46. By Martin Pool on 2010-09-09

Stash credentials into ServiceRoot object; they seem to be needed there

[Martin Pool (mbp)]

This fixes a few more things to get lp_print_me working, in particular

52 - credentials.exchange_request_token_for_access_token(web_root)
53 + d = credentials.exchange_request_token_for_access_token(web_root)
54 + d.addCallback(build_service_root)
55 + return d
56 + def build_service_root(ignored):
57 return cls.from_url(service_root, credentials)

This wasn't actually waiting for exchange_request_token_for_access_token to run!

[James Westby (james-w)]

Looks good, thanks.

James

review: Approve

[Martin Pool (mbp)]

Thanks for the prompt review.

At the moment the trunk is owned by you so you'll need to merge it.

=== modified file 'examples/lp_print_me.py'
--- examples/lp_print_me.py	2010-04-23 18:37:17 +0000
+++ examples/lp_print_me.py	2010-09-09 05:29:38 +0000
@@ -17,6 +17,8 @@
     cache = DesktopCouchCache(db)
     d = db.createDB()
 
+    defer.setDebugging(True)
+
     def ignore_existing(err):
         err.trap(twisted.web.error.Error)
         if err.value.status != "412":

=== modified file 'txrestfulclient/__init__.py'
--- txrestfulclient/__init__.py	2010-04-23 18:37:17 +0000
+++ txrestfulclient/__init__.py	2010-09-09 05:29:38 +0000
@@ -968,7 +968,9 @@
             def handle_response(response_and_body):
                 resp, body = response_and_body
                 bound_root = root_resource.bind(body, 'application/json')
-                return klass(root_uri, app, bound_root, browser)
+                sr = klass(root_uri, app, bound_root, browser)
+                sr.credentials = credentials
+                return sr
             return d.addCallback(handle_response)
         d.addCallback(create_object)
         return d

=== modified file 'txrestfulclient/browser.py'
--- txrestfulclient/browser.py	2010-04-23 18:37:17 +0000
+++ txrestfulclient/browser.py	2010-09-09 05:29:38 +0000
@@ -260,6 +260,11 @@
         self.response = response
         self.body = body
 
+    def __str__(self):
+        return ("txrestfulclient browser request failed: "
+            "response body:\n-----\n%s\n-----" % (
+             self.body))
+    
 
 def transform_error(response_and_body):
     resp, body = response_and_body

=== modified file 'txrestfulclient/launchpad/__init__.py'
--- txrestfulclient/launchpad/__init__.py	2010-04-23 18:37:17 +0000
+++ txrestfulclient/launchpad/__init__.py	2010-09-09 05:29:38 +0000
@@ -163,7 +163,10 @@
                 authorization_json['oauth_token'], allow_access_levels,
                 max_failed_attempts)
             authorizer()
-            credentials.exchange_request_token_for_access_token(web_root)
+            d = credentials.exchange_request_token_for_access_token(web_root)
+            d.addCallback(build_service_root)
+            return d
+        def build_service_root(ignored):
             return cls.from_url(service_root, credentials)
         d.addCallback(get_access_token)
         return d

=== modified file 'txrestfulclient/launchpad/credentials.py'
--- txrestfulclient/launchpad/credentials.py	2010-04-23 18:37:17 +0000
+++ txrestfulclient/launchpad/credentials.py	2010-09-09 05:29:38 +0000
@@ -67,7 +67,7 @@
         if token_format == self.DICT_TOKEN_FORMAT:
             headers['Accept'] = 'application/json'
         d = twisted.web.client.getPage(url, method='POST',
-                headers=headers, data=urlencode(params))
+                headers=headers, postdata=urlencode(params))
         def handle_response(content):
             if token_format == self.DICT_TOKEN_FORMAT:
                 params = simplejson.loads(content)
@@ -109,7 +109,7 @@
             oauth_signature='&%s' % self._request_token.secret)
         url = web_root + lplib_credentials.access_token_page
         d = twisted.web.client.getPage(url, method='POST',
-                data=urlencode(params))
+                postdata=urlencode(params))
         def handle_response(content):
             self.access_token = lplib_credentials.AccessToken.from_string(content)
         d.addCallback(handle_response)