Merge lp:~therve/txaws/post-support into lp:txaws

[Thomas Herve]

[lp:~therve/txaws/post-support]

70. By Thomas Herve on 2010-10-25

Simplify submit

[Robert Collins (lifeless)]

Looks ok at first glance. Does ec2 accept it?

[Free Ekanayaka (free.ekanayaka)]

Great branch, +1!

review: Approve

[lp:~therve/txaws/post-support]

71. By Thomas Herve on 2010-10-25

Blank line

72. By Thomas Herve on 2010-10-25

Update docstring

[Free Ekanayaka (free.ekanayaka)]

@Robert: it does

=== modified file 'txaws/ec2/client.py'
--- txaws/ec2/client.py	2010-09-08 22:00:50 +0000
+++ txaws/ec2/client.py	2010-10-25 21:08:07 +0000
@@ -836,7 +836,15 @@
         @return: A deferred from get_page
         """
         self.sign()
-        url = "%s?%s" % (self.endpoint.get_uri(),
-                         self.get_canonical_query_params())
-        d = self.get_page(url, method=self.endpoint.method)
+        url = self.endpoint.get_uri()
+        method = self.endpoint.method
+        params = self.get_canonical_query_params()
+        kwargs = {"method": method}
+        if method == "POST":
+            kwargs["headers"] = {
+                "Content-Type": "application/x-www-form-urlencoded"}
+            kwargs["postdata"] = params
+        else:
+            url += "?%s" % params
+        d = self.get_page(url, **kwargs)
         return d.addErrback(ec2_error_wrapper)

=== modified file 'txaws/ec2/tests/test_client.py'
--- txaws/ec2/tests/test_client.py	2010-09-08 22:00:50 +0000
+++ txaws/ec2/tests/test_client.py	2010-10-25 21:08:07 +0000
@@ -64,6 +64,30 @@
         ec2 = client.EC2Client()
         self.assertNotEqual(None, ec2.creds)
 
+    def test_post_method(self):
+        """
+        If the method of the endpoint is POST, the parameters are passed in the
+        body.
+        """
+        self.addCleanup(setattr, client.Query, "get_page",
+                        client.Query.get_page)
+
+        def get_page(query, url, *args, **kwargs):
+            self.assertEquals(args, ())
+            self.assertEquals(
+                kwargs["headers"],
+                {"Content-Type": "application/x-www-form-urlencoded"})
+            self.assertIn("postdata", kwargs)
+            self.assertEquals(kwargs["method"], "POST")
+            return succeed(payload.sample_describe_instances_result)
+
+        client.Query.get_page = get_page
+
+        creds = AWSCredentials("foo", "bar")
+        endpoint = AWSServiceEndpoint(uri=EC2_ENDPOINT_US, method="POST")
+        ec2 = client.EC2Client(creds=creds, endpoint=endpoint)
+        return ec2.describe_instances()
+
     def test_init_no_creds_non_available_errors(self):
         self.assertRaises(ValueError, client.EC2Client)
 

=== modified file 'txaws/service.py'
--- txaws/service.py	2009-11-27 20:37:56 +0000
+++ txaws/service.py	2010-10-25 21:08:07 +0000
@@ -74,10 +74,12 @@
         associated creds will be used against a collection of services.
     @param uri: an endpoint URI that, if provided, will override the region
         parameter.
+    @param method: The method argument forwarded to L{AWSServiceEndpoint}.
     """
     # XXX update unit test to check for both ec2 and s3 endpoints
     def __init__(self, creds=None, access_key="", secret_key="",
-                 region=REGION_US, uri="", ec2_uri="", s3_uri=""):
+                 region=REGION_US, uri="", ec2_uri="", s3_uri="",
+                 method="GET"):
         if not creds:
             creds = AWSCredentials(access_key, secret_key)
         self.creds = creds
@@ -91,8 +93,8 @@
         if not s3_uri:
             s3_uri = S3_ENDPOINT
         self._clients = {}
-        self.ec2_endpoint = AWSServiceEndpoint(uri=ec2_uri)
-        self.s3_endpoint = AWSServiceEndpoint(uri=s3_uri)
+        self.ec2_endpoint = AWSServiceEndpoint(uri=ec2_uri, method=method)
+        self.s3_endpoint = AWSServiceEndpoint(uri=s3_uri, method=method)
 
     def get_client(self, cls, purge_cache=False, *args, **kwds):
         """