From a3c7c84d49c3e6563e7f37ef60c989f99ed96788 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 15 Jul 2016 22:50:33 -0700
Subject: improve message content semantics

---
 netlib/http/headers.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'netlib/http/headers.py')

diff --git a/netlib/http/headers.py b/netlib/http/headers.py
index f052a53b..13a8c98f 100644
--- a/netlib/http/headers.py
+++ b/netlib/http/headers.py
@@ -204,3 +204,15 @@ def parse_content_type(c):
             if len(clause) == 2:
                 d[clause[0].strip()] = clause[1].strip()
     return ts[0].lower(), ts[1].lower(), d
+
+
+def assemble_content_type(type, subtype, parameters):
+    if not parameters:
+        return "{}/{}".format(type, subtype)
+    params = "; ".join(
+        "{}={}".format(k, v)
+        for k, v in parameters.items()
+    )
+    return "{}/{}; {}".format(
+        type, subtype, params
+    )
-- 
cgit v1.2.3


From 1a1f7e6fd94b434c4440d3cbc9407dbe3e0db6f9 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sat, 16 Jul 2016 13:00:33 +1200
Subject: replacehooks -> addon

Also fixes a bug in header replacements in netlib that resulted in a mutable
multidict.
---
 netlib/http/headers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'netlib/http/headers.py')

diff --git a/netlib/http/headers.py b/netlib/http/headers.py
index 413add87..c8cf3e43 100644
--- a/netlib/http/headers.py
+++ b/netlib/http/headers.py
@@ -183,8 +183,8 @@ class Headers(multidict.MultiDict):
                 pass
             else:
                 replacements += n
-            fields.append([name, value])
-        self.fields = fields
+            fields.append((name, value))
+        self.fields = tuple(fields)
         return replacements
 
 
-- 
cgit v1.2.3


From e6e39ce80f4daaf6a1d6f8d87616409486d358a5 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 15 Jul 2016 23:46:12 -0700
Subject: preserve content-type parameter order

---
 netlib/http/headers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'netlib/http/headers.py')

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)
-- 
cgit v1.2.3