[Python-checkins] cpython (merge 3.4 -> 3.5): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/41dc8034458c
changeset:   98669:41dc8034458c
branch:      3.5
parent:      98664:794101c6e560
parent:      98668:275d388ca1fc
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Oct 10 23:24:39 2015 -0700
summary:
  merge 3.4

files:
  Doc/faq/extending.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -443,8 +443,8 @@
 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

-- 
Repository URL: https://hg.python.org/cpython