Merge pull request #296 from cganterh/master

There was a problem with headers when a binary string is passed (like b'Authorization').

Author: jcgregorio

python3/httplib2/__init__.py

@@ -192,8 +192,13 @@ def safename(filename):
 
 NORMALIZE_SPACE = re.compile(r'(?:\r\n)?[ \t]+')
 def _normalize_headers(headers):
-    return dict([ (key.lower(), NORMALIZE_SPACE.sub(value, ' ').strip())  for (key, value) in headers.items()])
+    return dict([ (_convert_byte_str(key).lower(), NORMALIZE_SPACE.sub(_convert_byte_str(value), ' ').strip())  for (key, value) in headers.items()])
 
+def _convert_byte_str(s):
+    if not isinstance(s, str):
+        return str(s, 'utf-8')
+    return s
+    
 def _parse_cache_control(headers):
     retval = {}
     if 'cache-control' in headers:

python3/httplib2test.py

@@ -1235,6 +1235,12 @@ def testNormalizeHeaders(self):
         self.assertTrue('cache-control' in h)
         self.assertTrue('other' in h)
         self.assertEqual('Stuff', h['other'])
+    
+    def testConvertByteStr(self):
+        with self.assertRaises(TypeError):
+            httplib2._convert_byte_str(4)
+        self.assertEqual('Hello World', httplib2._convert_byte_str(b'Hello World'))
+        self.assertEqual('Bye World', httplib2._convert_byte_str('Bye World'))
 
     def testExpirationModelTransparent(self):
         # Test that no-cache makes our request TRANSPARENT