Cleanup.

shazow · shazow · commit 08e86e5d5043 · 2012-03-03T13:52:04.000-08:00
diff --git a/.coveragerc b/.coveragerc
@@ -5,6 +5,6 @@ omit = urllib3/packages/*
 exclude_lines =
     .* # Platform-specific.*
     except ImportError:
-    try:.* # Python 3
+    .*:.* # Python 3
     pass
     .* # Abstract
diff --git a/urllib3/response.py b/urllib3/response.py
@@ -171,15 +171,17 @@ def from_httplib(ResponseCls, r, **response_kw):
         with ``original_response=r``.
         """
 
-        # comma-seperate header values with identical header names
+        # Normalize headers between different versions of Python
         headers = {}
         for k, v in r.getheaders():
-            # In Python 3, the header keys are returned capitalised
+            # Python 3: Header keys are returned capitalised
             k = k.lower()
-            if k in headers:
-                headers[k] = headers[k] + ", " + v
-            else:
-                headers[k] = v
+
+            has_value = headers.get(k)
+            if has_value: # Python 3: Repeating header keys are unmerged.
+                v = ', '.join([has_value, v])
+
+            headers[k] = v
 
         # HTTPResponse objects in Python 3 don't have a .strict attribute
         strict = getattr(r, 'strict', 0)
