#16887: IDLE now accepts Cancel in tabify/untabify dialog box.
#16887: merge with 3.3.
Clean-up lru_cache examples.  The print() not is needed.  Set maxsize to a power of two.
merge
Remove redundant imports
Update argparse docs to follow order of ArgumentParser() arguments.
Update argparse docs to follow order of ArgumentParser() arguments.
Merge heads
Process DEFAULT values in mock side_effect that returns iterator.

Patch by Michael Ford.
Process DEFAULT values in mock side_effect that returns iterator.

Patch by Michael Ford.
add Zbigniew Halas to ACKS
merge heads
Issue #15596: Faster pickling of unicode strings.
#1207589: Backwards-compatibility patch for right-click menu in IDLE.
#1207589: merge with 3.3.
#17613: Prevent traceback when removing syntax colorizer in IDLE.
#17613: merge with 3.3.
gibibytes (Arfrever)