diff options
| author | Marc Bonnici <marc.bonnici@arm.com> | 2018-07-02 16:21:23 +0100 |
|---|---|---|
| committer | setrofim <setrofim@gmail.com> | 2018-07-04 16:33:08 +0100 |
| commit | 3fd40e5f19178f963c278b8877911b8f5c0f8f96 (patch) | |
| tree | 08e88cd9d876f7bf9807b4523822e147e34df673 /wa/utils | |
| parent | cbb8fdab28d757f1eb24f431f6d235d8d7c4b91a (diff) | |
utils/types: Fix correct arguments for join
Ensure that the join method for a ``str`` is passed a single list
instead of 2 arguments.
Diffstat (limited to 'wa/utils')
| -rw-r--r-- | wa/utils/types.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wa/utils/types.py b/wa/utils/types.py index 213668d5..17282f8d 100644 --- a/wa/utils/types.py +++ b/wa/utils/types.py @@ -454,10 +454,10 @@ class toggle_set(set): class ID(str): def merge_with(self, other): - return '_'.join(self, other) + return '_'.join([self, other]) def merge_into(self, other): - return '_'.join(other, self) + return '_'.join([other, self]) class obj_dict(MutableMapping): |