Merge lp:~fujita-tomonori-deactivatedaccount/swift/s3api-unicode-fix-1 into lp:~hudson-openstack/swift/trunk

[FUJITA Tomonori]

Fixes swift3 middleware so that container listings work correctly with utf-8 encoded container names.

[Chuck Thier (cthier)]

This still doesn't seem to work completely, but I think the issue is with boto. I imagine boto doesn't try to care about unicode, since I'm pretty sure that you can't have unicode container names. So while the requests work, some of the built in printing functions don't work properly.

To see the errors that I am seeing,

Run the functests, which will leave several containers that have utf-8 encoded container names. If you connect with boto, then run get_all_containers() and print the result, it errors. If you work with the results directly, it seems to work fine. I'm not entirely sure if there is anything that we can do about this. I'll need to think about it a bit more, and discuss with my co-workers.

[FUJITA Tomonori (fujita-tomonori-deactivatedaccount)]

2011/1/19 Chuck Thier <email address hidden>:
> This still doesn't seem to work completely, but I think the issue is with boto.  I imagine boto doesn't try to care about unicode, since I'm pretty sure that you can't have unicode container names.  So while the requests work, some of the built in printing functions don't work properly.

How do you print container names?

Seems that the following code works for me with unicode container names:

def list_buckets():
    conn = create_conn()
    buckets = conn.get_all_buckets()
    for b in buckets:
        print b.name

> To see the errors that I am seeing,
>
> Run the functests, which will leave several containers that have utf-8 encoded container names.  If you connect with boto, then run get_all_containers() and print the result, it errors.  If you work with the results directly, it seems to work fine.  I'm not entirely sure if there is anything that we can do about this.  I'll need to think about it a bit more, and discuss with my co-workers.
> --
> https://code.launchpad.net/~fujita-tomonori/swift/s3api-unicode-fix-1/+merge/46687
> You are the owner of lp:~fujita-tomonori/swift/s3api-unicode-fix-1.
>

[Chuck Thier (cthier)]

After some further experimenting, it looks like the underlying objects still work as expected. The __repr__ doesn't, so if you try "print conn.get_all_buckets()" it gets an error, but I can live with that.

review: Approve

=== modified file 'swift/common/middleware/swift3.py'
--- swift/common/middleware/swift3.py	2011-01-17 06:42:20 +0000
+++ swift/common/middleware/swift3.py	2011-01-18 21:54:53 +0000
@@ -139,11 +139,9 @@
                 return get_err_response('InvalidURI')
 
         containers = loads(''.join(list(body_iter)))
-        resp = Response(content_type='text/xml')
-        resp.status = 200
         # we don't keep the creation time of a backet (s3cmd doesn't
         # work without that) so we use something bogus.
-        resp.body = '<?xml version="1.0" encoding="UTF-8"?>' \
+        body = '<?xml version="1.0" encoding="UTF-8"?>' \
             '<ListAllMyBucketsResult ' \
               'xmlns="http://doc.s3.amazonaws.com/2006-03-01">' \
             '<Buckets>%s</Buckets>' \
@@ -151,6 +149,7 @@
             % ("".join(['<Bucket><Name>%s</Name><CreationDate>' \
                          '2009-02-03T16:45:09.000Z</CreationDate></Bucket>' %
                          xml_escape(i['name']) for i in containers]))
+        resp = Response(status=200, content_type='text/xml', body=body)
         return resp