[Zope-Checkins] CVS: Zope2 - StructuredText.py:1.34.8.4

[Andreas Jung]

Update of /cvs-repository/Zope2/lib/python/StructuredText
In directory yetix:/work/sandboxes/ajung-2_4-ts_regex-exterminiation-branch/lib/python/StructuredText

Modified Files:
      Tag: ajung-2_4-ts_regex-exterminiation-branch
	StructuredText.py 
Log Message:
fixed regex problem running into an recursion inside the re module



--- Updated File StructuredText.py in package Zope2 --
--- StructuredText.py	2001/04/23 20:04:11	1.34.8.3
+++ StructuredText.py	2001/04/23 20:14:37	1.34.8.4
@@ -367,7 +367,7 @@
         '''
 
 
-        pat = '\"([%s]*?)\":' % string.printable + \
+        pat = ' \"([%s0-9-_,./?=@~&]*)\":' % string.letters+ \
               '([-:%s0-9_,./?=@#~&]*?)' % string.letters + \
               '([.:?;] )' 
 
@@ -375,7 +375,7 @@
                 
         aStructuredString = p_reg.sub(r'<a href="\2">\1</a>\3 ' , aStructuredString)
 
-        pat = '\"([%s]*?)\", ' % string.printable + \
+        pat = ' \"([%s0-9-_,./?=@~&]*)\", ' % string.letters+ \
               '([-:%s0-9_,./?=@#~&]*?)' % string.letters + \
               '([.:?;] )'