[Zope-Checkins] CVS: Zope2 - HelpUtil.py:1.7.134.3

[chrism@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/HelpSys
In directory serenade.digicool.com:/home/chrism/sandboxes/RegexExtermination/lib/python/HelpSys

Modified Files:
      Tag: ajung-2_4-ts_regex-exterminiation-branch
	HelpUtil.py 
Log Message:
Changed sig_match and pre_match re's.


--- Updated File HelpUtil.py in package Zope2 --
--- HelpUtil.py	2001/04/23 16:21:27	1.7.134.2
+++ HelpUtil.py	2001/04/24 16:01:16	1.7.134.3
@@ -283,8 +283,8 @@
 
 
 # needs to be tested !!! The conversion of reconvert.convert looks suspicious
-pre_match=re.compile(r'[A-Za-z0-9_]*\\([^\\)]*\\)[ -]*').match # AJ
-sig_match=re.compile(r'[A-Za-z0-9_]*\\([^\\)]*\\)').match # AJ
+sig_match=re.compile(r'[\w]*\([^)]*\)').match # matches "f(arg1, arg2)"
+pre_match=re.compile(r'[\w]*\([^)]*\)[ -]*').match # with ' ' or '-' included
 
 class methodobject(object):