a more permissive media type pattern

plq · plq · commit a462770dfca8 · 2020-07-30T01:07:39.000+03:00
diff --git a/spyne/model/primitive/_base.py b/spyne/model/primitive/_base.py
@@ -38,6 +38,10 @@ def re_match_with_span(attr, value):
         return True
 
     m = attr._pattern_re.match(value)
+    # if m:
+    #     print(m, m.span(), len(value))
+    # else:
+    #     print(m)
     return (m is not None) and (m.span() == (0, len(value)))
 
 
diff --git a/spyne/model/primitive/string.py b/spyne/model/primitive/string.py
@@ -51,13 +51,13 @@ def _gen_mime_type_pattern(strict, with_params):
     else:
         main_type = token
 
-    parameter = \
-              ";" + ows + token + "=" + "(?:" + token + "|" + quotedString + ")"
+    param = token + "=" + "(?:" + token + "|" + quotedString + ");?" + ows
+    params = ";" + ows + param + "(" + param + ")*"
 
     if not with_params:
         return main_type + "/" + "(" + token + ")"
     else:
-        return main_type + "/" + "(" + token + ")((?:" + ows + parameter + ")*)"
+        return main_type + "/" + "(" + token + ")" + params
 
 
 MIME_TYPE_PATTERN_STRICT = \
diff --git a/spyne/test/model/test_primitive.py b/spyne/test/model/test_primitive.py
@@ -69,13 +69,22 @@ def test_mime_type_family(self):
 
         assert     rmws(media_attr, u'text/plain; charset="utf-8"')
         assert     rmws(media_attr, u'text/plain; charset=utf-8')
-        assert not rmws(media_attr, u'text/plain; charset=utf-8 ')
+        assert     rmws(media_attr, u'text/plain; charset=utf-8 ')
         assert     rmws(media_attr, u'text/plain; charset=utf-8')
-        assert not rmws(media_attr, u'text/plain; charset=utf-8;')
-        assert not rmws(media_attr, u'text/plain; charset=utf-8; ')
+        assert     rmws(media_attr, u'text/plain; charset=utf-8;')
+        assert     rmws(media_attr, u'text/plain; charset=utf-8; ')
         assert not rmws(media_attr, u'text/plain; charset=utf-8; foo')
         assert not rmws(media_attr, u'text/plain; charset=utf-8; foo=')
         assert     rmws(media_attr, u'text/plain; charset=utf-8; foo=""')
+        assert     rmws(media_attr, u'text/plain; charset=utf-8; foo="";')
+        assert     rmws(media_attr, u'text/plain; charset=utf-8; foo=""; ')
+        assert     rmws(media_attr, u'text/plain; charset=utf-8; foo="";  ')
+        assert not rmws(media_attr, u'text/plain;; charset=utf-8; foo=""')
+        assert not rmws(media_attr, u'text/plain;;; charset=utf-8; foo=""')
+        assert not rmws(media_attr, u'text/plain; charset=utf-8;; foo=""')
+        assert not rmws(media_attr, u'text/plain; charset=utf-8;;; foo=""')
+        assert not rmws(media_attr, u'text/plain; charset=utf-8;;; foo="";')
+        assert not rmws(media_attr, u'text/plain; charset=utf-8;;; foo=""; ; ')
         assert not rmws(media_strict_attr, u'foo/bar;')
         assert not rmws(media_strict_attr, u' applicaton/json;')
         assert not rmws(media_strict_attr, u'applicaton/json;')
