Skip to content

Commit 57c1c32

Browse files
committed
Merge branch 'rashid/forwarding_event_processor' into rashid/closeable_optimizely
# Conflicts: # optimizely/config_manager.py
2 parents aeb872c + 42a90f0 commit 57c1c32

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

tests/test_event_processor.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,7 @@ def __eq__(self, other):
4040
if other is None:
4141
return False
4242

43-
return (self._experiment_id == other._experiment_id and
44-
self._variation_id == other._variation_id and
45-
self._event_name == other._event_name and
46-
self._visitor_id == other._visitor_id and
47-
self._attributes == other._attributes and
48-
self._tags == other._tags)
43+
return self.__dict__ == other.__dict__
4944

5045

5146
class TestEventDispatcher(object):

tox.ini

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# E121 - continuation line indentation is not a multiple of four
55
# E127 - continuation line over-indented for visual indent
66
# E722 - do not use bare 'except'
7-
# W504 - line break after binary operator
8-
ignore = E111,E114,E121,E127,E722,W504
7+
ignore = E111,E114,E121,E127,E722
98
exclude = optimizely/lib/pymmh3.py,*virtualenv*
109
max-line-length = 120

0 commit comments

Comments
 (0)