r15244 - in /branches/frame_order_testing: ./ generic_fns/relax_re.py -- January 25, 2012 - 11:45

Author: bugman
Date: Wed Jan 25 11:45:16 2012
New Revision: 15244

URL: http://svn.gna.org/viewcvs/relax?rev=15244&view=rev
Log:
Merged revisions 15238 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r15238 | bugman | 2012-01-24 21:04:14 +0100 (Tue, 24 Jan 2012) | 3 lines
  
  Speed up for the generic_fns.relax_re.search() function.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/generic_fns/relax_re.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 25 11:45:16 2012
@@ -1,1 +1,1 @@
-/1.3:1-15236
+/1.3:1-15243

Modified: branches/frame_order_testing/generic_fns/relax_re.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/relax_re.py?rev=15244&r1=15243&r2=15244&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/relax_re.py (original)
+++ branches/frame_order_testing/generic_fns/relax_re.py Wed Jan 25 11:45:16 
2012
@@ -67,6 +67,10 @@
         # Force a conversion to str.
         pattern = str(pattern)
 
+        # Quick string check.
+        if id == pattern:
+            return True
+
         # First replace any '*' with '.*' (relax to re conversion).
         pattern_re = replace(pattern, '*', '.*')
         id_re =      replace(id,      '*', '.*')