preserve content-type parameter order

2 files changed, 5 insertions, 2 deletions

diff --git a/netlib/http/headers.py b/netlib/http/headers.py
index b8aa212a..9fa7e1e6 100644
--- a/netlib/http/headers.py
+++ b/netlib/http/headers.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, print_function, division
 
 import re
 
+import collections
 import six
 from netlib import multidict
 from netlib import strutils
@@ -206,7 +207,7 @@ def parse_content_type(c):
     ts = parts[0].split("/", 1)
     if len(ts) != 2:
         return None
-    d = {}
+    d = collections.OrderedDict()
     if len(parts) == 2:
         for i in parts[1].split(";"):
             clause = i.split("=", 1)
diff --git a/test/netlib/http/test_headers.py b/test/netlib/http/test_headers.py
index 8462a5af..51537310 100644
--- a/test/netlib/http/test_headers.py
+++ b/test/netlib/http/test_headers.py
@@ -1,3 +1,5 @@
+import collections
+
 from netlib.http.headers import Headers, parse_content_type, assemble_content_type
 from netlib.tutils import raises
 
@@ -87,4 +89,4 @@ def test_assemble_content_type():
     p = assemble_content_type
     assert p("text", "html", {}) == "text/html"
     assert p("text", "html", {"charset": "utf8"}) == "text/html; charset=utf8"
-    assert p("text", "html", {"charset": "utf8", "foo": "bar"}) == "text/html; charset=utf8; foo=bar"
+    assert p("text", "html", collections.OrderedDict([("charset", "utf8"), ("foo", "bar")])) == "text/html; charset=utf8; foo=bar"