Merge lp:~xnox/ubuntu/raring/thin-client-config-agent/fix-1152222 into lp:ubuntu/raring/thin-client-config-agent

[Dimitri John Ledkov]

Not sure where the "upstream" of thin-client-config-agent is, but I'm merely proposing a merge to fix bug #1152222 , which looks like a change in PyCurl API since quantal. But IMHO pycurl is now more correct: bytes are passed over the wire, and one must encode/decode before sending & receiving data. Alternatively it's a bug in PyCurl since it stopped accepting utf-8 strings.

[Barry Warsaw (barry)]

Looks reasonable to me.

review: Approve

[Michael Terry (mterry)]

Seems fine.

review: Approve

[David Barth (dbarth)]

Please see https://code.launchpad.net/~dbarth/ubuntu/raring/thin-client-config-agent/further-fix-1152222 which ensure the whole test suite passes. I think that this is the one xnox will end up merging.

[Dimitri John Ledkov (xnox)]

Merged into:
https://code.launchpad.net/~ubuntu-core-dev/thin-client-config-agent/trunk

review: Approve

=== modified file 'tccalib/__init__.py'
--- tccalib/__init__.py	2012-08-15 21:46:51 +0000
+++ tccalib/__init__.py	2013-04-03 10:40:33 +0000
@@ -70,8 +70,8 @@
         if _curl is None:
             _curl = pycurl.Curl()
         self.curl = _curl
-        self.result = StringIO()
-        self.response_header = StringIO()
+        self.result = BytesIO()
+        self.response_header = BytesIO()
         self.curl.setopt(pycurl.HEADERFUNCTION, self.response_header.write)
         self.curl.setopt(pycurl.WRITEFUNCTION, self.result.write)
         self.verify_ssl = True
@@ -127,7 +127,7 @@
         if status == 200:
             return self.result.getvalue()
         else:
-            lines = self.response_header.getvalue().splitlines(True)
+            lines = self.response_header.getvalue().decode('utf-8').splitlines(True)
             header_ = ''.join(lines[1:])
             headers = parse_headers(BytesIO(header_.encode('ascii')))
             raise urllib.error.HTTPError(