[Python-checkins] r69090 - in python/branches/release26-maint: Doc/library/datetime.rst Doc/reference/datamodel.rst

[brett.cannon]

Author: brett.cannon
Date: Thu Jan 29 04:58:16 2009
New Revision: 69090

Log:
Merged revisions 69078-69079 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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/datetime.rst
   python/branches/release26-maint/Doc/reference/datamodel.rst

Modified: python/branches/release26-maint/Doc/library/datetime.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/datetime.rst	(original)
+++ python/branches/release26-maint/Doc/library/datetime.rst	Thu Jan 29 04:58:16 2009
@@ -1269,7 +1269,7 @@
 :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

Modified: python/branches/release26-maint/Doc/reference/datamodel.rst
==============================================================================
--- python/branches/release26-maint/Doc/reference/datamodel.rst	(original)
+++ python/branches/release26-maint/Doc/reference/datamodel.rst	Thu Jan 29 04:58:16 2009
@@ -1249,7 +1249,9 @@
       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