]> granicus.if.org Git - python/commitdiff
Merge 3.2, issue #17047: remove doubled words found in 2.7 to
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 11 Mar 2013 21:58:27 +0000 (17:58 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 11 Mar 2013 21:58:27 +0000 (17:58 -0400)
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.

1  2 
Lib/_pyio.py
Lib/concurrent/futures/_base.py
Lib/ftplib.py
Lib/idlelib/rpc.py
Lib/test/test_descrtut.py
Lib/test/test_socket.py
Lib/turtle.py

diff --cc Lib/_pyio.py
Simple merge
Simple merge
diff --cc Lib/ftplib.py
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc Lib/turtle.py
Simple merge