--- old/httplib.py	2008-07-04 02:03:25.000000000 +0200
+++ new/httplib.py	2008-07-04 02:12:29.000000000 +0200
@@ -880,7 +880,11 @@
 
         if body and ('content-length' not in header_names):
             self.putheader('Content-Length', str(len(body)))
-        for hdr, value in headers.iteritems():
+        # Check for the dict-like iteritems interface, otherwise just blindly
+        # iterate through headers.
+        if hasattr(headers, "iteritems"):
+            headers = headers.iteritems()
+        for hdr, value in headers:
             self.putheader(hdr, value)
         self.endheaders()