summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-10-11 06:24:39 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-10-11 06:24:39 (GMT)
commitb16e12aaaa3d6b3f47dc1400e900c2d4aae0f337 (patch)
treeb1f006be93836915521c99120b0b48b3a093e79a
parent062f4cec5e457a78068c942faef999886adf53ff (diff)
parent0071b3dfcb9c5438ca404e173d4728386ccce580 (diff)
downloadcpython-b16e12aaaa3d6b3f47dc1400e900c2d4aae0f337.zip
cpython-b16e12aaaa3d6b3f47dc1400e900c2d4aae0f337.tar.gz
cpython-b16e12aaaa3d6b3f47dc1400e900c2d4aae0f337.tar.bz2
merge 3.4
-rw-r--r--Doc/faq/extending.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
index ae0d905..7bb4dc2 100644
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -443,8 +443,8 @@ 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 built-in classes such as :class:`int`,
-:class:`list`, :class:`dict`, etc.
+Yes, 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)
provides a way of doing this from C++ (i.e. you can inherit from an extension