sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-31 07:04:17 +00:00
Code Issues Releases Wiki Activity

utils/types: fix toggle_set merge methods

Browse Source 
- The merge_with and merge_into implementation was reversed. Fix this, so that
  it is implemented correctly, i.e. that
  	a.merge_with(b) === merge(a, b)
	a.merge_into(b) === merge(b, a)
- Ensure that in case of merge_into(), a toggle_set is always returned.
This commit is contained in:
sergei Trofimov
2018-04-27 14:07:19 +01:00
committed by Marc Bonnici
parent 5b03ac3afd
commit 9093477f1b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wa/utils/types.py
View File

@@ -390,12 +390,12 @@ class toggle_set(set):
set.__init__(self, *args)
def merge_with(self, other):
new_self = copy(self)
return toggle_set.merge(other, new_self)
other = copy(other)
return toggle_set.merge(self, toggle_set(other))
def merge_into(self, other):
other = copy(other)
return toggle_set.merge(self, other)
new_self = copy(self)
return toggle_set.merge(other, new_self)
def add(self, item):
if item not in self: