diff options
| author | Brett Cannon <bcannon@gmail.com> | 2009-01-29 04:10:21 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2009-01-29 04:10:21 (GMT) |
| commit | e1327f71cf619f65eb81b7c31089611bc71ffe00 (patch) | |
| tree | 075d376916a70e9b0015a9748974e676bfc2615b /Doc | |
| parent | 19f8bd2834196b964568c07e5f159c516431b4b5 (diff) | |
| download | cpython-e1327f71cf619f65eb81b7c31089611bc71ffe00.zip cpython-e1327f71cf619f65eb81b7c31089611bc71ffe00.tar.gz cpython-e1327f71cf619f65eb81b7c31089611bc71ffe00.tar.bz2 | |
Merged revisions 69078-69080 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69078 | brett.cannon | 2009-01-28 16:54:11 -0800 (Wed, 28 Jan 2009) | 2 lines
Clarify some __del__ stuff.
........
r69079 | brett.cannon | 2009-01-28 16:54:32 -0800 (Wed, 28 Jan 2009) | 2 lines
Minor spelling mistake in datetime docs.
........
r69080 | brett.cannon | 2009-01-28 16:55:33 -0800 (Wed, 28 Jan 2009) | 2 lines
Ignore .pyc and .pyo files.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/datetime.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/datamodel.rst | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index e25d042..f082726 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1266,7 +1266,7 @@ Example: :class:`tzinfo` Objects ----------------------- -:class:`tzinfo` is an abstract base clase, meaning that this class should not be +:class:`tzinfo` is an abstract base class, meaning that this class should not be instantiated directly. You need to derive a concrete subclass, and (at least) supply implementations of the standard :class:`tzinfo` methods needed by the :class:`datetime` methods you use. The :mod:`datetime` module does not supply diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 502305d..3fda6a4 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1096,7 +1096,9 @@ Basic customization is printed to ``sys.stderr`` instead. Also, when :meth:`__del__` is invoked in response to a module being deleted (e.g., when execution of the program is done), other globals referenced by the :meth:`__del__` method may already have - been deleted. For this reason, :meth:`__del__` methods should do the absolute + been deleted or in the process of being torn down (e.g. the import + machinery shutting down). For this reason, :meth:`__del__` methods + should do the absolute minimum needed to maintain external invariants. Starting with version 1.5, Python guarantees that globals whose name begins with a single underscore are deleted from their module before other globals are deleted; if no other |