summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-08-19 01:19:36 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-08-19 01:19:36 (GMT)
commit24d6cc6f4f9872a486d47355e577d1bf3e033415 (patch)
tree3b8f3acd8498aea2df299cbadad48296b1f11ab3 /Doc/glossary.rst
parent50e516aa8e981b767398dd0a0d42cb726bb35975 (diff)
parenta2d26182e28e99a66d9ed128f429d17ea53d48ae (diff)
downloadcpython-24d6cc6f4f9872a486d47355e577d1bf3e033415.zip
cpython-24d6cc6f4f9872a486d47355e577d1bf3e033415.tar.gz
cpython-24d6cc6f4f9872a486d47355e577d1bf3e033415.tar.bz2
Merge 3.2
Diffstat (limited to 'Doc/glossary.rst')
-rw-r--r--Doc/glossary.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 6984bf2..358f40e 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -163,8 +163,8 @@ Glossary
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 :term:`abstract base class`\ es.) Instead, it typically employs
- :func:`hasattr` tests or :term:`EAFP` programming.
+ with :term:`abstract base classes <abstract base class>`.) Instead, it
+ typically employs :func:`hasattr` tests or :term:`EAFP` programming.
EAFP
Easier to ask for forgiveness than permission. This common Python coding