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

[chrism@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/StructuredText
In directory serenade:/home/chrism/BackTalk/lib/python/StructuredText

Modified Files:
	DocumentClass.py 
Log Message:
Fix for dumb bug in previous fix that extended the set of characters representing an absolute and relative URL.. thanks again to Datagrok.


--- Updated File DocumentClass.py in package Zope2 --
--- DocumentClass.py	2001/06/28 12:25:12	1.28
+++ DocumentClass.py	2001/07/02 12:16:33	1.29
@@ -951,8 +951,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,