txaws-dev team mailing list archive

[Clint Byrum <clint@xxxxxxxxxx>]

Clint Byrum has proposed merging lp:~clint-fewbar/txaws/fix-s3-port into lp:txaws.

Requested reviews:
  txAWS Developers (txaws-dev)
Related bugs:
  Bug #824403 in txAWS: "ensemble should support openstack as a provider"
  https://bugs.launchpad.net/txaws/+bug/824403

For more details, see:
https://code.launchpad.net/~clint-fewbar/txaws/fix-s3-port/+merge/71289

Always use port for S3 so OpenStack works
-- 
https://code.launchpad.net/~clint-fewbar/txaws/fix-s3-port/+merge/71289
Your team txAWS Developers is requested to review the proposed merge of lp:~clint-fewbar/txaws/fix-s3-port into lp:txaws.

=== modified file 'txaws/s3/client.py'
--- txaws/s3/client.py	2011-04-14 19:50:30 +0000
+++ txaws/s3/client.py	2011-08-11 22:59:22 +0000
@@ -57,8 +57,8 @@
         return path
 
     def get_url(self):
-        return "%s://%s%s" % (
-            self.endpoint.scheme, self.get_host(), self.get_path())
+        return "%s://%s:%d%s" % (
+            self.endpoint.scheme, self.get_host(), self.endpoint.port, self.get_path())
 
 
 class S3Client(BaseClient):

=== modified file 'txaws/service.py'
--- txaws/service.py	2011-05-13 10:17:00 +0000
+++ txaws/service.py	2011-08-11 22:59:22 +0000
@@ -32,7 +32,7 @@
 
     def _parse_uri(self, uri):
         scheme, host, port, path = parse(
-            str(uri), defaultPort=False)
+            str(uri), defaultPort=True)
         self.scheme = scheme
         self.host = host
         self.port = port