[issue25410] Clean up and fix OrderedDict

[Eric Snow]

Eric Snow added the comment:

new patch LGTM

----------

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