summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-07-04 17:33:33 (GMT)
committerGeorg Brandl <georg@python.org>2010-07-04 17:33:33 (GMT)
commit31a0f86e368c980b751bdc0b377e42322cf2566d (patch)
treeedbf9b91a59d40cfce91ba657364fdcac6be3d07 /Doc/glossary.rst
parent1b84b5fd6422fbedbd038a9774df8d8904a66367 (diff)
downloadcpython-31a0f86e368c980b751bdc0b377e42322cf2566d.zip
cpython-31a0f86e368c980b751bdc0b377e42322cf2566d.tar.gz
cpython-31a0f86e368c980b751bdc0b377e42322cf2566d.tar.bz2
Merged revisions 77316 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r77316 | georg.brandl | 2010-01-05 11:22:04 +0100 (Di, 05 Jan 2010) | 1 line Assorted doc fixes by Florent. ........
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 a05db12..5442720 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -355,7 +355,7 @@ Glossary
list comprehension
A compact way to process all or part of the elements in a sequence and
- return a list with the results. ``result = ["0x%02x" % x for x in
+ return a list with the results. ``result = ['{:#04x}'.format(x) for x in
range(256) if x % 2 == 0]`` generates a list of strings containing
even hex numbers (0x..) in the range from 0 to 255. The :keyword:`if`
clause is optional. If omitted, all elements in ``range(256)`` are
@@ -473,7 +473,7 @@ Glossary
object drops to zero, it is deallocated. Reference counting is
generally not visible to Python code, but it is a key element of the
:term:`CPython` implementation. The :mod:`sys` module defines a
- :func:`getrefcount` function that programmers can call to return the
+ :func:`~sys.getrefcount` function that programmers can call to return the
reference count for a particular object.
__slots__