mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge

Browse source
This commit is contained in:
Raymond Hettinger 2016-08-25 21:12:16 -07:00
commit f74c33ad5c
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/reference/datamodel.rst
View file

@ -1123,7 +1123,7 @@ Basic customization
instance; for example: ``BaseClass.__init__(self, [args...])``.
Because :meth:`__new__` and :meth:`__init__` work together in constructing
objects (:meth:`__new__` to create it, and :meth:`__init__` to customise it),
objects (:meth:`__new__` to create it, and :meth:`__init__` to customize it),
no non-``None`` value may be returned by :meth:`__init__`; doing so will
cause a :exc:`TypeError` to be raised at runtime.
@ -1697,7 +1697,7 @@ By default, classes are constructed using :func:`type`. The class body is
executed in a new namespace and the class name is bound locally to the
result of ``type(name, bases, namespace)``.
The class creation process can be customised by passing the ``metaclass``
The class creation process can be customized by passing the ``metaclass``
keyword argument in the class definition line, or by inheriting from an
existing class that included such an argument. In the following example,
both ``MyClass`` and ``MySubclass`` are instances of ``Meta``::