summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-07-11 08:56:18 (GMT)
committerGeorg Brandl <georg@python.org>2010-07-11 08:56:18 (GMT)
commit9b42f17feba76d80d6fbddc3cc8849d8cc1ede26 (patch)
tree2233e184318cd77ce2c10caf9e2a2f981df2166e /Doc
parent5e4c177e88de146b1b4729f71e985101e0e48388 (diff)
downloadcpython-9b42f17feba76d80d6fbddc3cc8849d8cc1ede26.zip
cpython-9b42f17feba76d80d6fbddc3cc8849d8cc1ede26.tar.gz
cpython-9b42f17feba76d80d6fbddc3cc8849d8cc1ede26.tar.bz2
Merged revisions 82790 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r82790 | georg.brandl | 2010-07-11 10:36:20 +0200 (So, 11 Jul 2010) | 1 line #3214 followup: add link to ABC entry. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/glossary.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 5442720..e8ff819 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -154,9 +154,9 @@ Glossary
must be a duck.") By emphasizing interfaces rather than specific types,
well-designed code improves its flexibility by allowing polymorphic
substitution. Duck-typing avoids tests using :func:`type` or
- :func:`isinstance`. (Note, however, that duck-typing can be complemented
- with abstract base classes.) Instead, it typically employs :func:`hasattr`
- tests or :term:`EAFP` programming.
+ :func:`isinstance`. (Note, however, that duck-typing can be complemented
+ with :term:`abstract base class`\ es.) Instead, it typically employs
+ :func:`hasattr` tests or :term:`EAFP` programming.
EAFP
Easier to ask for forgiveness than permission. This common Python coding