From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 11 Mar 2013 21:59:07 +0000 (-0400)
Subject: Merge 3.3, issue #17047: remove doubled words found in 2.7 to
X-Git-Tag: v3.4.0a1~1219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba;p=python

Merge 3.3, issue #17047: remove doubled words found in 2.7 to
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
---

16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba
diff --cc Lib/test/test_socket.py
index 19377d0858,d20e37bff6..d4ea43ac54
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@@ -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)