Merged revisions 78217-78218 via svnmerge from

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

........
  r78217 | mark.dickinson | 2010-02-18 14:27:02 +0000 (Thu, 18 Feb 2010) | 5 lines

  Issue #7633: Context method in the decimal module (with the exception
  of the 'canonical' and 'is_canonical' methods) now consistently accept
  integer arguments wherever a Decimal instance is accepted.  Thanks
  Juan José Conti for the patch.
........
  r78218 | mark.dickinson | 2010-02-18 14:45:33 +0000 (Thu, 18 Feb 2010) | 1 line

  Doctest fixes for decimal.py:  add an integer-argument doctest for logical_invert;  don't use integer literals with a leading zero.
........

Doc/library/decimal.rst

@@ -896,8 +896,11 @@ In addition to the three supplied contexts, new contexts can be created with the
    a large number of methods for doing arithmetic directly in a given context.
    In addition, for each of the :class:`Decimal` methods described above (with
    the exception of the :meth:`adjusted` and :meth:`as_tuple` methods) there is
-   a corresponding :class:`Context` method.  For example, ``C.exp(x)`` is
-   equivalent to ``x.exp(context=C)``.
+   a corresponding :class:`Context` method.  For example, for a :class:`Context`
+   instance ``C`` and :class:`Decimal` instance ``x``, ``C.exp(x)`` is
+   equivalent to ``x.exp(context=C)``.  Each :class:`Context` method accepts a
+   Python integer (an instance of :class:`int` or :class:`long`) anywhere that a
+   Decimal instance is accepted.
 
 
    .. method:: clear_flags()

Misc/ACKS

@@ -150,6 +150,7 @@ Benjamin Collar
 Jeffery Collins
 Robert Collins
 Paul Colomiets
+Juan José Conti
 Matt Conway
 David M. Cooke
 Greg Copeland

Misc/NEWS

@@ -242,6 +242,12 @@ C-API
 Library
 -------
 
+- Issue #7633: In the decimal module, Context class methods (with the
+  exception of canonical and is_canonical) now accept instances of int
+  and long wherever a Decimal instance is accepted, and implicitly
+  convert that argument to Decimal.  Previously only some arguments
+  were converted.
+
 - Issue #7835: shelve should no longer produce mysterious warnings during
   interpreter shutdown.