r5687 - /1.3/generic_fns/selection.py -- April 14, 2008 - 16:17

Author: bugman
Date: Mon Apr 14 16:12:39 2008
New Revision: 5687

URL: http://svn.gna.org/viewcvs/relax?rev=5687&view=rev
Log:
The molecule and residue name checking now use the new Selection.match() 
method.


Modified:
    1.3/generic_fns/selection.py

Modified: 1.3/generic_fns/selection.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/selection.py?rev=5687&r1=5686&r2=5687&view=diff
==============================================================================
--- 1.3/generic_fns/selection.py (original)
+++ 1.3/generic_fns/selection.py Mon Apr 14 16:12:39 2008
@@ -124,14 +124,14 @@
         elif isinstance(obj, MoleculeContainer):
             if not self.molecules:
                 return True
-            elif obj.name in self.molecules:
+            elif self.match(obj.name, self.molecules):
                 return True
 
         # The object is a residue.
         elif isinstance(obj, ResidueContainer):
             if not self.residues:
                 return True
-            elif obj.name in self.residues or obj.num in self.residues:
+            elif self.match(obj.name, self.residues) or obj.num in 
self.residues:
                 return True
 
         # The object is a spin.