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

1  2 
Lib/_pyio.py
Lib/concurrent/futures/_base.py
Lib/distutils/command/install.py
Lib/distutils/tests/test_install.py
Lib/ftplib.py
Lib/idlelib/rpc.py
Lib/lib2to3/pgen2/grammar.py
Lib/test/test_socket.py
Lib/turtle.py

diff --cc Lib/_pyio.py
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc Lib/ftplib.py
Simple merge
Simple merge
Simple merge
index 19377d085880def38f3d182e91f44bb3e13c4fc8,d20e37bff6f7024787449cb0fed104590d5beb92..d4ea43ac54ccedf5b5193b48a333de7ca492d1ea
@@@ -872,10 -842,10 +872,10 @@@ class GeneralModuleTests(unittest.TestC
          # Try same call with optional protocol omitted
          port2 = socket.getservbyname(service)
          eq(port, port2)
-         # Try udp, but don't barf it it doesn't exist
+         # Try udp, but don't barf if it doesn't exist
          try:
              udpport = socket.getservbyname(service, 'udp')
 -        except socket.error:
 +        except OSError:
              udpport = None
          else:
              eq(udpport, port)
diff --cc Lib/turtle.py
Simple merge