diff options
| author | Raymond Hettinger <python@rcn.com> | 2016-08-26 04:12:16 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2016-08-26 04:12:16 (GMT) |
| commit | f74c33ad5c94f1f07f574336dc2d5a6345acdcc7 (patch) | |
| tree | 7de71390a5ea30877d31e56c5fabf44529c86fd2 /Doc/reference | |
| parent | 8f2ee0d5ffe82c5873bff914835724be0107b0c6 (diff) | |
| parent | 7ea386e56e76deb2ceeb87c0ac4b346e24cd82e1 (diff) | |
| download | cpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.zip cpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.tar.gz cpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.tar.bz2 | |
Merge
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/datamodel.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 08d87cc..e7328ab 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -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``:: |