Merged revisions 70171,70183,70290,70292,70315,70438,70464 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70171 | facundo.batista | 2009-03-04 22:18:17 +0100 (Mi, 04 Mär 2009) | 3 lines

  Fixed a typo.
........
  r70183 | benjamin.peterson | 2009-03-05 01:17:57 +0100 (Do, 05 Mär 2009) | 1 line

  add example
........
  r70290 | raymond.hettinger | 2009-03-10 02:07:30 +0100 (Di, 10 Mär 2009) | 1 line

  Update url for the spec.
........
  r70292 | raymond.hettinger | 2009-03-10 05:40:24 +0100 (Di, 10 Mär 2009) | 1 line

  Clarify the meaning of normal and subnormal.
........
  r70315 | raymond.hettinger | 2009-03-12 01:25:03 +0100 (Do, 12 Mär 2009) | 1 line

  Add reference to solution for a commonly asked question.
........
  r70438 | benjamin.peterson | 2009-03-17 21:29:51 +0100 (Di, 17 Mär 2009) | 1 line

  I thought this was begging for an example
........
  r70464 | benjamin.peterson | 2009-03-18 21:58:09 +0100 (Mi, 18 Mär 2009) | 1 line

  a much better example
........

diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index 7cd8952fa3e671808fcce8e42bff8de4880235cc..6e45e84721e14f3f0c0a083a4e9b93b19d2fd0b9 100644 (file)
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -108,7 +108,7 @@ reset them before monitoring a calculation.
 .. seealso::
 
    * IBM's General Decimal Arithmetic Specification, `The General Decimal Arithmetic
-     Specification <http://www2.hursley.ibm.com/decimal/decarith.html>`_.
+     Specification <http://speleotrove.com/decimal/>`_.
 
    * IEEE standard 854-1987, `Unofficial IEEE 854 Text
      <http://754r.ucbtest.org/standards/854.pdf>`_.
@@ -531,8 +531,11 @@ Decimal objects
 
    .. method:: is_normal()
 
-      Return :const:`True` if the argument is a *normal* finite number.  Return
-      :const:`False` if the argument is zero, subnormal, infinite or a NaN.
+      Return :const:`True` if the argument is a *normal* finite non-zero
+      number with an adjusted exponent greater than or equal to *Emin*.
+      Return :const:`False` if the argument is zero, subnormal, infinite or a
+      NaN.  Note, the term *normal* is used here in a different sense with
+      the :meth:`normalize` method which is used to create canonical values.
 
       .. versionadded:: 2.6
 
@@ -560,7 +563,8 @@ Decimal objects
    .. method:: is_subnormal()
 
       Return :const:`True` if the argument is subnormal, and :const:`False`
-      otherwise.
+      otherwise. A number is subnormal is if it is nonzero, finite, and has an
+      adjusted exponent less than *Emin*.
 
       .. versionadded:: 2.6
 

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index d716e97558d7cc3a24bf5ddab34a1b4b60e8db12..55f23b957924e0a3b52e996f051c92d22cb9b95c 100644 (file)
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -603,6 +603,14 @@ available.  They are listed here in alphabetical order.
    its :meth:`next` method; if the value returned is equal to *sentinel*,
    :exc:`StopIteration` will be raised, otherwise the value will be returned.
 
+   One useful application of the second form of :func:`iter` is to read lines of
+   a file until a certain line is reached.  The following example reads a file
+   until ``"STOP"`` is reached: ::
+
+      with open("mydata.txt") as fp:
+          for line in iter(fp.readline, "STOP"):
+              process_line(line)
+
    .. versionadded:: 2.2
 
 

diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
index 63bf9b178e2cf559d3d058840a302796ef3315ad..d29bd7bb77f4d85b3df8f3fbea02e71b45dc9234 100644 (file)
--- a/Doc/library/struct.rst
+++ b/Doc/library/struct.rst
@@ -50,7 +50,7 @@ The module defines the following exception and functions:
 
 .. function:: unpack_from(fmt, buffer[,offset=0])
 
-   Unpack the *buffer* according to tthe given format. The result is a tuple even
+   Unpack the *buffer* according to the given format. The result is a tuple even
    if it contains exactly one item. The *buffer* must contain at least the amount
    of data required by the format (``len(buffer[offset:])`` must be at least
    ``calcsize(fmt)``).

diff --git a/Doc/library/symtable.rst b/Doc/library/symtable.rst
index 28306e673675218c4690927c6a5a0b5097d365da..9ea3f01b40799dc64e29fc5045a4b26ba0e25c61 100644 (file)
--- a/Doc/library/symtable.rst
+++ b/Doc/library/symtable.rst
@@ -164,6 +164,12 @@ Examining Symbol Tables
       If the name is used as the target of a function or class statement, this
       will be true.
 
+      For example::
+
+         >>> table = symtable.symtable("def some_func(): pass", "string", "exec")
+         >>> table.lookup("some_func").is_namespace()
+         True
+
       Note that a single name can be bound to multiple objects.  If the result
       is ``True``, the name may also be bound to other objects, like an int or
       list, that does not introduce a new namespace.

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 7c526947813080f031c164d53d6a90f77145430b..5d612b814edc5c9e76736c7824b41edbc5ea0f2f 100644 (file)
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1347,6 +1347,9 @@ Basic customization
 
    Arguments to rich comparison methods are never coerced.
 
+   To automatically generate ordering operations from a single root operation,
+   see the `Total Ordering recipe in the ASPN cookbook
+   <http://code.activestate.com/recipes/576529/>`_\.
 
 .. method:: object.__cmp__(self, other)