r5689 - /1.3/generic_fns/selection.py -- April 14, 2008 - 16:18

Author: bugman
Date: Mon Apr 14 16:18:54 2008
New Revision: 5689

URL: http://svn.gna.org/viewcvs/relax?rev=5689&view=rev
Log:
Converted all numbers to strings for the Selection.wildcard_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=5689&r1=5688&r2=5689&view=diff
==============================================================================
--- 1.3/generic_fns/selection.py (original)
+++ 1.3/generic_fns/selection.py Mon Apr 14 16:18:54 2008
@@ -124,21 +124,21 @@
         elif isinstance(obj, MoleculeContainer):
             if not self.molecules:
                 return True
-            elif self.wildcard_match(obj.name, self.molecules):
+            elif self.wildcard_match(str(obj.name), self.molecules):
                 return True
 
         # The object is a residue.
         elif isinstance(obj, ResidueContainer):
             if not self.residues:
                 return True
-            elif self.wildcard_match(obj.name, self.residues) or obj.num in 
self.residues:
+            elif self.wildcard_match(str(obj.name), self.residues) or 
obj.num in self.residues:
                 return True
 
         # The object is a spin.
         elif isinstance(obj, SpinContainer):
             if not self.spins:
                 return True
-            elif self.wildcard_match(obj.name, self.spins) or obj.num in 
self.spins:
+            elif self.wildcard_match(str(obj.name), self.spins) or obj.num 
in self.spins:
                 return True
 
         # No match.
@@ -190,9 +190,8 @@
 
         # Loop over the patterns.
         for pattern in patterns:
-            # Skip integers.
-            if type(pattern) == int:
-                continue
+            # Force a conversion to str.
+            pattern = str(pattern)
 
             # String matches.
             if search(pattern, string):