From: Michael W. Hudson <mwh@python.net>
Date: Mon, 11 Mar 2002 10:20:04 +0000 (+0000)
Subject: backport gvanrossum's checkin of
X-Git-Tag: v2.2.1c1~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd268a192490b4dbe3d714b97ee9fc9ed871f714;p=thirdparty%2FPython%2Fcpython.git

backport gvanrossum's checkin of
    revision 1.117 of test_descr.py

Bugfix candidate.
Adapter from SF patch 528038; fixes SF bug 527816.

The wrapper for __nonzero__ should be wrap_inquiry rather than
wrap_unaryfunc, since the slot returns an int, not a PyObject *.
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index de9bba163660..696e99c92790 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -426,6 +426,9 @@ def numops(a, b, skip=[]):
 def ints():
     if verbose: print "Testing int operations..."
     numops(100, 3)
+    # The following crashes in Python 2.2
+    vereq((1).__nonzero__(), 1)
+    vereq((0).__nonzero__(), 0)
 
 def longs():
     if verbose: print "Testing long operations..."