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

[David Barth]

Additional fixes on top of xnox's branch to solve the login problem and let all unit tests pass

[Dimitri John Ledkov (xnox)]

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

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-08-14 16:02:35 +0000
+++ Makefile	2013-04-03 14:20:36 +0000
@@ -1,5 +1,5 @@
 lint:
 	pyflakes $$(find -name '*.py') $$(grep '^#!.*python' $$(bzr ls -Vkfile) -l)
 check:
-	python -m unittest tccalib.tests
+	python3 -m unittest tccalib.tests
 .PHONY: lint check

=== modified file 'tccalib/__init__.py'
--- tccalib/__init__.py	2012-08-15 21:46:51 +0000
+++ tccalib/__init__.py	2013-04-03 14:20:36 +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
@@ -125,9 +125,9 @@
                 raise
         status = self.curl.getinfo(pycurl.HTTP_CODE)
         if status == 200:
-            return self.result.getvalue()
+            return self.result.getvalue().decode('utf-8')
         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(

=== modified file 'tccalib/tests/__init__.py'
--- tccalib/tests/__init__.py	2012-08-15 21:46:51 +0000
+++ tccalib/tests/__init__.py	2013-04-03 14:20:36 +0000
@@ -10,6 +10,7 @@
 import base64
 
 import pycurl
+from io import BytesIO
 
 from tccalib import (
     CertificateVerificationFailed,
@@ -125,8 +126,8 @@
         self.options = {}
         self.info = {}
         self.response_status = response_status
-        self.response_header = header
-        self.response_body = body
+        self.response_header = bytes(header, 'UTF-8')
+        self.response_body = bytes(body, 'UTF-8')
         self.effective_url=effective_url
         self.perform_error = perform_error
 
@@ -185,7 +186,7 @@
         getter = PycURLGetter(curl)
         output = getter.handle_response()
         self.assertEqual('My body!', output)
-        self.assertEqual('My header!', getter.response_header.getvalue())
+        self.assertEqual('My header!', getter.response_header.getvalue().decode('UTF-8'))
         self.assertEqual('http://example.com/',
                          getter.curl.getinfo(pycurl.EFFECTIVE_URL))
 
@@ -205,7 +206,7 @@
             self.assertEqual("'HTTPError' object has no attribute 'url'",
                              str(attre))
         self.assertEqual(500, httpe.getcode())
-        self.assertEqual('My body!', httpe.msg)
+        self.assertEqual('My body!', httpe.msg.decode('UTF-8'))
         self.assertEqual([('Content-type', 'fake')], httpe.hdrs.items())
 
     def test_handle_response_connection_error(self):