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

[chrism@serenade.digicool.com]

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

Modified Files:
      Tag: Zope-2_4-branch
	DocumentClass.py 
Log Message:
Collector 2348 - fix for doc_href not recognizing URLs with query strings.  Merge from trunk.


--- Updated File DocumentClass.py in package Zope2 --
--- DocumentClass.py	2001/06/26 09:30:23	1.22.2.4
+++ DocumentClass.py	2001/06/28 12:28:25	1.22.2.5
@@ -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,