Changeset 89

Show
Ignore:
Timestamp:
Thu Aug 24 17:42:15 2006
Author:
jpellerin
Message:

Fixed more uses of include/exclude to handle lists

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/nose/plugins/doctests.py

    r76 r89  
    94 94         # FIXME don't think we need include/exclude checks here?  
    95 95         return ((self.doctest_tests or not self.conf.testMatch.search(name)  
    96                    or (self.conf.include is not None  
    97                        and self.conf.include.search(name)))  
    98                   and (self.conf.exclude is None  
    99                        or not self.conf.exclude.search(name)))  
    100            
      96                  or (self.conf.include  
      97                      and filter(None,  
      98                                 [inc.search(name)  
      99                                  for inc in self.conf.include])))  
      100                 and (not self.conf.exclude  
      101                      or not filter(None,  
      102                                    [exc.search(name)  
      103                                     for exc in self.conf.exclude])))  
    101 104      
    102 105     def wantFile(self, file, package=None):  

  • trunk/nose/selector.py

    r87 r89  
    213 213         tail = os.path.basename(dirname)                 
    214 214         if os.path.exists(init):  
    215               wanted = (self.exclude is None or not self.exclude.search(tail))  
      215             wanted = (not self.exclude  
      216                       or not filter(None,  
      217                                     [exc.search(tail) for exc in self.exclude]  
      218                                     ))  
    216 219         else:  
    217 220             wanted = (self.matches(tail)