7

Use timezone-aware dates and times in rules (#197)

* use timezone-aware dates and times re #196

* remove redundant newlines

* Fix flake8 linting errors in python 3.6
This commit is contained in:
aweakley
2019-01-25 02:27:34 +11:00
committed by Jasper Berghoef
parent 1e69d929aa
commit 956c1bf4f5
2 changed files with 7 additions and 5 deletions

View File

@ -196,8 +196,10 @@ class SessionSegmentsAdapter(BaseSegmentsAdapter):
for segment in enabled_segments:
if segment.is_static and segment.static_users.filter(id=self.request.user.id).exists():
additional_segments.append(segment)
elif (segment.excluded_users.filter(id=self.request.user.id).exists() or
segment in excluded_segments):
elif any((
segment.excluded_users.filter(id=self.request.user.id).exists(),
segment in excluded_segments
)):
continue
elif not segment.is_static or not segment.is_full:
segment_rules = []