diff options
| author | Bruno Wagner Goncalves <bwagner@thoughtworks.com> | 2014-08-18 16:50:02 -0300 |
|---|---|---|
| committer | Bruno Wagner Goncalves <bwagner@thoughtworks.com> | 2014-08-18 16:56:44 -0300 |
| commit | 9900ee2ec6b52d8887f00c4d39d0ff30a2714421 (patch) | |
| tree | 07abc917968d5477c2c9b905461435bc07b059cb /py-fake-service/app/search/search_query.py | |
| parent | 693f2213bc0d34f85beee36709323651cffd2263 (diff) | |
Fixed PEP8 issues on py fake service
Diffstat (limited to 'py-fake-service/app/search/search_query.py')
| -rw-r--r-- | py-fake-service/app/search/search_query.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/py-fake-service/app/search/search_query.py b/py-fake-service/app/search/search_query.py index 765d1008..ec9b054f 100644 --- a/py-fake-service/app/search/search_query.py +++ b/py-fake-service/app/search/search_query.py @@ -49,17 +49,20 @@ class SearchQuery: self.compiled = compiled def test(self, mail): + if 'all' in self.compiled.get('tags'): + return True + if set(self.compiled.get('not_tags')).intersection(set(mail.tags)): return False - if set(self.compiled.get('tags')).intersection(set(mail.tags)) or 'all' in self.compiled.get('tags'): + if set(self.compiled.get('tags')).intersection(set(mail.tags)): return True if self.compiled.get('general'): search_terms = re.compile( self.compiled['general'], flags=re.IGNORECASE) - if search_terms.search(mail.body) or search_terms.search(mail.subject): + if search_terms.search(mail.subject+' '+mail.body): return True if not [v for v in self.compiled.values() if v]: |