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.
........
This commit is contained in:
Brett Cannon 2009-01-29 04:10:21 +00:00
parent 19f8bd2834
commit e1327f71cf
2 changed files with 4 additions and 2 deletions

View File

@ -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

View File

@ -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