From ca888fca0a45d2a92bff635fd26a5cf79a8cf1d2 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Thu, 18 Feb 2010 14:58:36 +0000
Subject: [PATCH] Blocked revisions 78219 via svnmerge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

................
  r78219 | mark.dickinson | 2010-02-18 14:49:50 +0000 (Thu, 18 Feb 2010) | 16 lines

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