summaryrefslogtreecommitdiff
path: root/lib/testtools/testtools/content_type.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/testtools/testtools/content_type.py')
-rw-r--r--lib/testtools/testtools/content_type.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/testtools/testtools/content_type.py b/lib/testtools/testtools/content_type.py
index 82c301b38d..c4914088cd 100644
--- a/lib/testtools/testtools/content_type.py
+++ b/lib/testtools/testtools/content_type.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2011 testtools developers. See LICENSE for details.
+# Copyright (c) 2009-2012 testtools developers. See LICENSE for details.
"""ContentType - a MIME Content Type."""
@@ -30,10 +30,12 @@ class ContentType(object):
if self.parameters:
params = '; '
params += ', '.join(
- '%s="%s"' % (k, v) for k, v in self.parameters.items())
+ sorted('%s="%s"' % (k, v) for k, v in self.parameters.items()))
else:
params = ''
return "%s/%s%s" % (self.type, self.subtype, params)
+JSON = ContentType('application', 'json')
+
UTF8_TEXT = ContentType('text', 'plain', {'charset': 'utf8'})