From 9900ee2ec6b52d8887f00c4d39d0ff30a2714421 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Goncalves Date: Mon, 18 Aug 2014 16:50:02 -0300 Subject: Fixed PEP8 issues on py fake service --- py-fake-service/app/search/search_query.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'py-fake-service/app/search/search_query.py') 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]: -- cgit v1.2.3