[Python-checkins] r84986 - in python/branches/release31-maint: Lib/test/test_descr.py Misc/NEWS Objects/typeobject.c

mark.dickinson python-checkins at python.org
Thu Sep 23 22:16:03 CEST 2010


Author: mark.dickinson
Date: Thu Sep 23 22:16:03 2010
New Revision: 84986

Log:
Merged revisions 84984 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84984 | mark.dickinson | 2010-09-23 21:11:19 +0100 (Thu, 23 Sep 2010) | 5 lines
  
  Issue #9930: Remove an unnecessary type check in wrap_binaryfunc_r;
  this was causing reversed method calls like float.__radd__(3.0, 1) to
  return NotImplemented instead of the expected numeric value.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_descr.py
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Objects/typeobject.c

Modified: python/branches/release31-maint/Lib/test/test_descr.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_descr.py	(original)
+++ python/branches/release31-maint/Lib/test/test_descr.py	Thu Sep 23 22:16:03 2010
@@ -289,6 +289,11 @@
         self.assertEqual(repr(a), "234.5")
         self.assertEqual(a.prec, 12)
 
+    def test_explicit_reverse_methods(self):
+        # see issue 9930
+        self.assertEqual(complex.__radd__(3j, 4.0), complex(4.0, 3.0))
+        self.assertEqual(float.__rsub__(3.0, 1), -2.0)
+
     @support.impl_detail("the module 'xxsubtype' is internal")
     def test_spam_lists(self):
         # Testing spamlist operations...

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Thu Sep 23 22:16:03 2010
@@ -12,6 +12,10 @@
 Core and Builtins
 -----------------
 
+- Issue #9930: Remove bogus subtype check that was causing (e.g.)
+  float.__rdiv__(2.0, 3) to return NotImplemented instead of the
+  expected 1.5.
+
 - Issue #9804: ascii() now always represents unicode surrogate pairs as
   a single ``\UXXXXXXXX``, regardless of whether the character is printable
   or not.  Also, the "backslashreplace" error handler now joins surrogate

Modified: python/branches/release31-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release31-maint/Objects/typeobject.c	(original)
+++ python/branches/release31-maint/Objects/typeobject.c	Thu Sep 23 22:16:03 2010
@@ -4049,10 +4049,6 @@
     if (!check_num_args(args, 1))
         return NULL;
     other = PyTuple_GET_ITEM(args, 0);
-    if (!PyType_IsSubtype(Py_TYPE(other), Py_TYPE(self))) {
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    }
     return (*func)(other, self);
 }
 


More information about the Python-checkins mailing list