Fixed some incorrect header string key types

werkzeug/testsuite/utils.py

@@ -42,6 +42,16 @@ def test_redirect(self):
         self.assert_equal(resp.headers['Location'], 'http://example.com/')
         self.assert_equal(resp.status_code, 305)
 
+    def test_redirect_no_unicode_header_keys(self):
+        # Make sure all headers are native keys.  This was a bug at one point
+        # due to an incorrect conversion.
+        resp = utils.redirect('http://example.com/', 305)
+        for key, value in resp.headers.items():
+            self.assert_equal(type(key), str)
+            self.assert_equal(type(value), text_type)
+        self.assert_equal(resp.headers['Location'], 'http://example.com/')
+        self.assert_equal(resp.status_code, 305)
+
     def test_redirect_xss(self):
         location = 'http://example.com/?xss="><script>alert(1)</script>'
         resp = utils.redirect(location)

werkzeug/wrappers.py

@@ -1023,12 +1023,12 @@ def get_wsgi_headers(self, environ):
                     current_url = iri_to_uri(current_url)
                 location = url_join(current_url, location)
             if location != old_location:
-                headers[u'Location'] = location
+                headers['Location'] = location
 
         # make sure the content location is a URL
         if content_location is not None and \
            isinstance(content_location, text_type):
-            headers[u'Content-Location'] = iri_to_uri(content_location)
+            headers['Content-Location'] = iri_to_uri(content_location)
 
         # remove entity headers and set content length to zero if needed.
         # Also update content_length accordingly so that the automatic