[Zope-Checkins] CVS: Zope2 - DocumentClass.py:1.31

andreas@digicool.com andreas@digicool.com
Thu, 12 Jul 2001 14:37:14 -0400 (EDT)


Update of /cvs-repository/Zope2/lib/python/StructuredText
In directory korak.digicool.com:/tmp/cvs-serv10421/lib/python/StructuredText

Modified Files:
	DocumentClass.py 
Log Message:
Collector 2396: STXNG: URLs containing '%' were not handled properly
like http://zope.org/%7e/.... (replacement for tilde)

Notice: to be backported to 2.4 branch after 2.4 release




--- Updated File DocumentClass.py in package Zope2 --
--- DocumentClass.py	2001/07/02 19:13:38	1.30
+++ DocumentClass.py	2001/07/12 18:37:12	1.31
@@ -949,8 +949,8 @@
 
     ## Some constants to make the doc_href() regex easier to read.
     _DQUOTEDTEXT = r'("[ %s0-9\n\r\-\.\,\;\(\)\/\:\/\*\']+")' % letters ## double quoted text
-    _ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&]+)' % letters
-    _ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&]+)' % letters
+    _ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%]+)' % letters
+    _ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%]+)' % letters
     _SPACES = r'(\s*)'
     
     def doc_href(self, s,