[Zope3-checkins] SVN: Zope3/trunk/src/zope/publisher/ Merged revision 38041 from the Zope-3.1 branch:

[Dmitry Vasiliev]

Log message for revision 38042:
  Merged revision 38041 from the Zope-3.1 branch:
  
  'text/vnd.wap.wml' is a valid content type
  

Changed:
  U   Zope3/trunk/src/zope/publisher/contenttype.py
  U   Zope3/trunk/src/zope/publisher/tests/test_contenttype.py

-=-
Modified: Zope3/trunk/src/zope/publisher/contenttype.py
===================================================================
--- Zope3/trunk/src/zope/publisher/contenttype.py	2005-08-23 12:51:29 UTC (rev 38041)
+++ Zope3/trunk/src/zope/publisher/contenttype.py	2005-08-23 13:30:38 UTC (rev 38042)
@@ -100,7 +100,7 @@
 
 def _token_match(string):
     global _token_match
-    _token_match = re.compile("[^][ \t\n\r()<>@,;:\"/?.=\\\\]+$").match
+    _token_match = re.compile("[^][ \t\n\r()<>@,;:\"/?=\\\\]+$").match
     return _token_match(string)
 
 def _unescape(string):

Modified: Zope3/trunk/src/zope/publisher/tests/test_contenttype.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_contenttype.py	2005-08-23 12:51:29 UTC (rev 38041)
+++ Zope3/trunk/src/zope/publisher/tests/test_contenttype.py	2005-08-23 13:30:38 UTC (rev 38042)
@@ -39,6 +39,8 @@
                          ("text", "plain", self.empty_params))
         self.assertEqual(self.parse("TeXt / PlaIN"),
                          ("text", "plain", self.empty_params))
+        self.assertEqual(self.parse("text / vnd.wap.wml"),
+                         ("text", "vnd.wap.wml", self.empty_params))
 
     def test_with_empty_params(self):
         self.assertEqual(self.parse("text/plain ; "),