From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 16 Aug 2010 16:08:12 +0000 (+0000)
Subject: Merged revisions 82529 via svnmerge from
X-Git-Tag: v2.6.6rc2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0261d2e361151741613574e0047df5c6639074f3;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 82529 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r82529 | florent.xicluna | 2010-07-04 16:24:40 +0200 (dim., 04 juil. 2010) | 1 line

  Issue #9145: Fix a regression due to r79539
........
---

diff --git a/Lib/test/test_coercion.py b/Lib/test/test_coercion.py
index 23816b53c4c6..d842ee9e1e56 100644
--- a/Lib/test/test_coercion.py
+++ b/Lib/test/test_coercion.py
@@ -2,6 +2,7 @@ import copy
 import unittest
 from test.test_support import run_unittest, TestFailed, check_warnings
 
+
 # Fake a number that implements numeric methods through __coerce__
 class CoerceNumber:
     def __init__(self, arg):
@@ -222,6 +223,11 @@ def process_infix_results():
             infix_results[key] = res
 
 
+with check_warnings(("classic (int|long) division", DeprecationWarning),
+                    quiet=True):
+    process_infix_results()
+    # now infix_results has two lists of results for every pairing.
+
 prefix_binops = [ 'divmod' ]
 prefix_results = [
     [(1,0), (1L,0L), (0.0,2.0), ((1+0j),0j), TE, TE, TE, TE, (1,0)],
@@ -336,9 +342,6 @@ def test_main():
                          DeprecationWarning),
                         ("classic (int|long) division", DeprecationWarning),
                         quiet=True):
-        process_infix_results()
-        # now infix_results has two lists of results for every pairing.
-
         run_unittest(CoercionTest)
 
 if __name__ == "__main__":
diff --git a/Misc/NEWS b/Misc/NEWS
index cc0ac5cf7246..aa3247d9d1b5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,8 @@ Extension Modules
 Tests
 -----
 
+- Issue #9145: Fix test_coercion failure in refleak runs.
+
 - Issue #8433: Fix test_curses failure caused by newer versions of
   ncurses returning ERR from getmouse() when there are no mouse
   events available.