Skip to content

Commit

Permalink
Make between-source joining behavior for colliding custom metadata ma…
Browse files Browse the repository at this point in the history
…tch the within-source behavior, and just smush the lists together. Fixes #1161.
  • Loading branch information
tabatkins committed Jan 4, 2018
1 parent bbd6a9c commit c35823c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bikeshed/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ def join(*sources):
mdentry = knownKeys[k]
md.addParsedData(k, getattr(mdsource, mdentry.attrName))
for k,v in mdsource.otherMetadata.items():
md.otherMetadata[k] = v
md.otherMetadata[k].extend(v)
return md

@attr.s(slots=True, frozen=True)
Expand Down

0 comments on commit c35823c

Please sign in to comment.