Merge lp:~niemeyer/txaws/fix-path-with-bucket into lp:txaws

[Gustavo Niemeyer]

This fixes the use of bucket names in the paths when object names are
not used, and fixes the test to reflect it too.

[lp:~niemeyer/txaws/fix-path-with-bucket]

82. By Gustavo Niemeyer on 2011-04-14

Use bucket name when URLContext has no object name

[Jamu Kakar (jkakar)]

Look good here, thanks, +1!

review: Approve

=== modified file 'txaws/s3/client.py'
--- txaws/s3/client.py	2011-04-13 14:49:52 +0000
+++ txaws/s3/client.py	2011-04-14 19:52:30 +0000
@@ -48,8 +48,9 @@
 
     def get_path(self):
         path = "/"
+        if self.bucket is not None:
+            path += self.bucket
         if self.bucket is not None and self.object_name:
-            path += self.bucket
             if not self.object_name.startswith("/"):
                 path += "/"
             path += self.object_name

=== modified file 'txaws/s3/tests/test_client.py'
--- txaws/s3/tests/test_client.py	2011-04-13 14:49:52 +0000
+++ txaws/s3/tests/test_client.py	2011-04-14 19:52:30 +0000
@@ -34,7 +34,7 @@
 
     def test_get_path_with_bucket(self):
         url_context = client.URLContext(self.endpoint, bucket="mystuff")
-        self.assertEquals(url_context.get_path(), "/")
+        self.assertEquals(url_context.get_path(), "/mystuff")
 
     def test_get_path_with_bucket_and_object(self):
         url_context = client.URLContext(