diff options
| author | Georg Brandl <georg@python.org> | 2010-02-06 18:46:57 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-02-06 18:46:57 (GMT) |
| commit | c4a55fccaba4936458c32f5f3b3913fcf2848b42 (patch) | |
| tree | a90e0efacec59c07bc943ba8ab8593a3a1f6f4ed /Doc/faq/extending.rst | |
| parent | 3102bd9afe7fe657a8e3533b5cdee3e5e9282f27 (diff) | |
| download | cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.zip cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.tar.gz cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.tar.bz2 | |
Recorded merge of revisions 78024 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78024 | georg.brandl | 2010-02-06 19:44:44 +0100 (Sa, 06 Feb 2010) | 1 line
#5341: fix "builtin" where used as an adjective ("built-in" is correct).
........
Diffstat (limited to 'Doc/faq/extending.rst')
| -rw-r--r-- | Doc/faq/extending.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst index 9091193..7f0c16e 100644 --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -441,7 +441,7 @@ extension module using g++ (e.g., ``g++ -shared -o mymodule.so mymodule.o``). Can I create an object class with some methods implemented in C and others in Python (e.g. through inheritance)? ---------------------------------------------------------------------------------------------------------------- -In Python 2.2, you can inherit from builtin classes such as :class:`int`, +In Python 2.2, you can inherit from built-in classes such as :class:`int`, :class:`list`, :class:`dict`, etc. The Boost Python Library (BPL, http://www.boost.org/libs/python/doc/index.html) |