r6802 - /1.3/generic_fns/relax_re.py -- July 07, 2008 - 16:07

Author: bugman
Date: Mon Jul  7 15:38:16 2008
New Revision: 6802

URL: http://svn.gna.org/viewcvs/relax?rev=6802&view=rev
Log:
Fix for the generic_fns.relax_re.search() function.

The re.search() function was clashing with the relax_re.search() function.


Modified:
    1.3/generic_fns/relax_re.py

Modified: 1.3/generic_fns/relax_re.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/relax_re.py?rev=6802&r1=6801&r2=6802&view=diff
==============================================================================
--- 1.3/generic_fns/relax_re.py (original)
+++ 1.3/generic_fns/relax_re.py Mon Jul  7 15:38:16 2008
@@ -24,7 +24,7 @@
 """Module implementing relax regular expression."""
 
 # Python module imports.
-from re import search
+import re
 from string import replace
 
 
@@ -73,9 +73,9 @@
         id_re = '^' + id_re + '$'
 
         # String matches (both ways).
-        if search(pattern_re, id):
+        if re.search(pattern_re, id):
             return True
-        if search(id_re, pattern):
+        if re.search(id_re, pattern):
             return True
 
     # No matches.