[issue27286] str object got multiple values for keyword argument

[Martin Panter]

Martin Panter added the comment:

Diff showing what changed relative to the main 3.5 branch when merging in the 3.5.2 release: <https://hg.python.org/cpython/rev/31a2a278dc85:1f8938164809>.

There are four news entries deleted from the 3.5.2rc1 section. Ideally they should have been moved to the 3.5.3rc1 section instead, because they were added after 3.5.2rc1 was branched, but before the 3.5.3rc1 heading appeared.

Also, there were some minor corrections of mine and Victor’s that were undone.

And I would suggest to restrict merge commits to changes that are already in at least one of the branches being merged. The edit to “byte-like” was not present in either of the branches being merged. In Git I think they call these changes “evil merges”.

----------

_______________________________________
Python tracker <report at bugs.python.org>
<http://bugs.python.org/issue27286>
_______________________________________