Merge lp:~gholt/swift/python2.7compat into lp:~hudson-openstack/swift/trunk

[gholt]

Fixed Python 2.7 compatibility problem

[John Dickinson (notmyname)]

is there any issue with overriding bufferedhttp.HTTPSConnection in the test and not setting it back? Shouldn't it use some sort of save globals?

review: Needs Information

[gholt (gholt)]

Bleh, yes it should reset things. Fix for that pushed.

[lp:~gholt/swift/python2.7compat]

292. By gholt on 2011-05-12

Fixed unit test not restoring things to prepatched state

[John Dickinson (notmyname)]

LGTM

review: Approve

[David Goetz (david-goetz)]

looks good

review: Approve

=== modified file 'CHANGELOG'
--- CHANGELOG	2011-05-12 19:34:47 +0000
+++ CHANGELOG	2011-05-12 22:55:54 +0000
@@ -8,3 +8,5 @@
     (X-Trans-ID). Setting the transaction id has moved from the proxy server to
     the catch_errors middleware. Additionally, the internal header has changed
     from X-CF-Trans-ID to X-Trans-ID.
+
+  * Fixed Python 2.7 httplib compatibility problem.

=== modified file 'swift/common/bufferedhttp.py'
--- swift/common/bufferedhttp.py	2011-01-19 21:22:05 +0000
+++ swift/common/bufferedhttp.py	2011-05-12 22:55:54 +0000
@@ -131,7 +131,7 @@
     conn.putrequest(method, path)
     if headers:
         for header, value in headers.iteritems():
-            conn.putheader(header, value)
+            conn.putheader(header, str(value))
     conn.endheaders()
     return conn
 
@@ -164,6 +164,6 @@
     conn.putrequest(method, path)
     if headers:
         for header, value in headers.iteritems():
-            conn.putheader(header, value)
+            conn.putheader(header, str(value))
     conn.endheaders()
     return conn

=== modified file 'test/unit/common/test_bufferedhttp.py'
--- test/unit/common/test_bufferedhttp.py	2011-01-04 23:34:43 +0000
+++ test/unit/common/test_bufferedhttp.py	2011-05-12 22:55:54 +0000
@@ -68,6 +68,35 @@
                 if err:
                     raise Exception(err)
 
+    def test_nonstr_header_values(self):
+
+        class MockHTTPSConnection(object):
+
+            def __init__(self, hostport):
+                pass
+
+            def putrequest(self, method, path):
+                pass
+
+            def putheader(self, header, *values):
+                # Essentially what Python 2.7 does that caused us problems.
+                '\r\n\t'.join(values)
+
+            def endheaders(self):
+                pass
+
+        origHTTPSConnection = bufferedhttp.HTTPSConnection
+        bufferedhttp.HTTPSConnection = MockHTTPSConnection
+        try:
+            bufferedhttp.http_connect('127.0.0.1', 8080, 'sda', 1, 'GET', '/',
+                headers={'x-one': '1', 'x-two': 2, 'x-three': 3.0,
+                         'x-four': {'crazy': 'value'}}, ssl=True)
+            bufferedhttp.http_connect_raw('127.0.0.1', 8080, 'GET', '/',
+                headers={'x-one': '1', 'x-two': 2, 'x-three': 3.0,
+                         'x-four': {'crazy': 'value'}}, ssl=True)
+        finally:
+            bufferedhttp.HTTPSConnection = origHTTPSConnection
+
 
 if __name__ == '__main__':
     unittest.main()