[issue28201] dict: perturb shift should be done when first conflict

[INADA Naoki]

INADA Naoki added the comment:

josh.r:

>  I believe per PEP7, we're still sticking to ANSI C (aka C89), and specifically, "all declarations must be at the top of a block (not necessarily at the top of function".

Python 3.6 branch allows some C99 features.
https://www.python.org/dev/peps/pep-0007/#c-dialect

> Removing those unrelated changes looks like it would dramatically reduce the churn too, making review easier.

While I think refactoring around changes is practical [1], I agree that I made too much change.  I'll reduce diff size.

[1] Changing without refactoring is hard sometimes. Whole file refactoring
    without actual change may cause many conflicts against other patches.

----------

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