From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 7 Mar 2010 16:25:25 +0000 (+0000)
Subject: Blocked revisions 78762 via svnmerge
X-Git-Tag: v3.2a1~1538
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc43fb4bdfb8b0bc4d6289f1779d52d33efa351e;p=thirdparty%2FPython%2Fcpython.git

Blocked revisions 78762 via svnmerge

........
  r78762 | mark.dickinson | 2010-03-07 16:24:45 +0000 (Sun, 07 Mar 2010) | 8 lines

  Issue #1530559: When packing a non-integer with any integer conversion
  code using struct.pack, attempt to convert to an integer first using
  the argument's __int__ method (if present).  Also raise a
  DeprecationWarning for any such usage of __int__.

  This fixes a regression from 2.6, where some (but not all) integer
  conversion codes already used __int__.
........
---