diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 17:59:07 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 17:59:07 -0400 |
| commit | 16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba (patch) | |
| tree | 794a55c65c29332c5994e97428d4ee96d1f5256b /Lib/test | |
| parent | 16c41d8520b7993cffa576f9021ff712d80ab825 (diff) | |
| parent | 98472b839674a78b0cbb09f50a61f70019591a4a (diff) | |
| download | cpython-git-16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba.tar.gz | |
Merge 3.3, issue #17047: remove doubled words found in 2.7 to
3.4 Lib/*, as reported by Serhiy Storchaka and Matthew Barnett.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_descrtut.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_socket.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py index f495e1816b..506d1abeb6 100644 --- a/Lib/test/test_descrtut.py +++ b/Lib/test/test_descrtut.py @@ -319,7 +319,7 @@ Attributes defined by get/set methods ... return self.__set(inst, value) Now let's define a class with an attribute x defined by a pair of methods, -getx() and and setx(): +getx() and setx(): >>> class C(object): ... diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 19377d0858..d4ea43ac54 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -872,7 +872,7 @@ class GeneralModuleTests(unittest.TestCase): # 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 OSError: |