diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:58:27 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:58:27 (GMT) |
| commit | 98472b839674a78b0cbb09f50a61f70019591a4a (patch) | |
| tree | 7644852bcc4bcb5833aec9b1dfd8a419f60d0446 /Lib/test | |
| parent | 09b7503bc999b2c65c9d61465cd19758ff97c0c4 (diff) | |
| parent | c30b7b16ea03ad094917615940cd1a9ef53c4904 (diff) | |
| download | cpython-98472b839674a78b0cbb09f50a61f70019591a4a.zip cpython-98472b839674a78b0cbb09f50a61f70019591a4a.tar.gz cpython-98472b839674a78b0cbb09f50a61f70019591a4a.tar.bz2 | |
Merge 3.2, 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 f495e18..506d1ab 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 da6ef05..d20e37b 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -842,7 +842,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 socket.error: |