total rewrite of accept header parsing

bwhmather · Aug 22, 2015 · 9d37668 · 9d37668
1 parent 5112278
commit 9d37668
Show file tree

Hide file tree

Showing 7 changed files with 497 additions and 448 deletions.
diff --git a/verktyg/application.py b/verktyg/application.py
@@ -129,8 +129,9 @@ def __init__(
 
         if default_request_mixins:
             self.add_request_mixins(
-                requests.BaseRequest, requests.AcceptMixin,
-                requests.ETagRequestMixin, requests.UserAgentMixin,
+                requests.BaseRequest,
+                requests.ETagRequestMixin,
+                requests.UserAgentMixin,
                 requests.AuthorizationMixin,
                 requests.CommonRequestDescriptorsMixin,
             )

diff --git a/verktyg/http/__init__.py b/verktyg/http/__init__.py
@@ -32,11 +32,12 @@
     is_byte_range_valid,
 )
 from verktyg.http.accept import (
-    Accept,
-    MIMEAccept,
-    LanguageAccept,
-    CharsetAccept,
-    parse_accept_header,
+    ContentType, ContentTypeAccept,
+    parse_content_type_header, parse_accept_header,
+    Language, LanguageAccept,
+    parse_language_header, parse_accept_language_header,
+    Charset, CharsetAccept,
+    parse_charset_header, parse_accept_charset_header,
 )
 from verktyg.http.cache_control import (
     IfRange,
@@ -96,11 +97,12 @@
     'is_entity_header',
     'is_hop_by_hop_header',
     'is_byte_range_valid',
-    'Accept',
-    'MIMEAccept',
-    'LanguageAccept',
-    'CharsetAccept',
-    'parse_accept_header',
+    'ContentType', 'ContentTypeAccept',
+    'parse_content_type_header', 'parse_accept_header',
+    'Language', 'LanguageAccept',
+    'parse_language_header', 'parse_accept_language_header',
+    'Charset', 'CharsetAccept',
+    'parse_charset_header', 'parse_accept_charset_header',
     'IfRange',
     'Range',
     'ContentRange',