[3.6] bpo-31583: Fix 2to3 for using with --add-suffix option (GH-3758) by miss-islington · Pull Request #6529 · python/cpython

Hm. The failure on Travis is unrelated:

======================================================================
ERROR: test_ignore (test.test_multiprocessing_forkserver.TestIgnoreEINTR)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/travis/build/python/cpython/Lib/test/_test_multiprocessing.py", line 4050, in test_ignore
    os.kill(p.pid, signal.SIGUSR1)
ProcessLookupError: [Errno 3] No such process