Merge pull request #17 from F-Secure/master

Always return binary-strings from _get_data()

stubserver/webserver.py

@@ -181,7 +181,7 @@ def __init__(self, expectations):
     def _get_data(self):
         max_chunk_size = 10 * 1024 * 1024
         if "content-length" not in self.headers:
-            return ""
+            return b''
         size_remaining = int(self.headers["content-length"])
         data = []
         while size_remaining:

test.py

@@ -19,10 +19,13 @@ def tearDown(self):
         self.server.stop()
         self.server.verify()  # this is redundant because stop includes verify
 
-    def _make_request(self, url, method="GET", payload="", headers={}):
+    def _make_request(self, url, method="GET", payload=None, headers={}):
         self.opener = OpenerDirector()
         self.opener.add_handler(HTTPHandler())
-        request = Request(url, headers=headers, data=payload.encode('utf-8'))
+        if payload is None:
+            request = Request(url, headers=headers)
+        else:
+            request = Request(url, headers=headers, data=payload.encode('utf-8'))
         request.get_method = lambda: method
         response = self.opener.open(request)
         response_code = getattr(response, 'code', -1)