summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_descrtut.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 21:58:27 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 21:58:27 (GMT)
commit98472b839674a78b0cbb09f50a61f70019591a4a (patch)
tree7644852bcc4bcb5833aec9b1dfd8a419f60d0446 /Lib/test/test_descrtut.py
parent09b7503bc999b2c65c9d61465cd19758ff97c0c4 (diff)
parentc30b7b16ea03ad094917615940cd1a9ef53c4904 (diff)
downloadcpython-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/test_descrtut.py')
-rw-r--r--Lib/test/test_descrtut.py2
1 files changed, 1 insertions, 1 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):
...