Fold in Ryan's magicsuper changes from its commit 7216702

- See rfk/magicsuper#6.
- Also skip some tests for newsuper() on Py3

Author: edschofield

future/builtins/newsuper.py

@@ -75,12 +75,18 @@ def newsuper(typ=_SENTINEL, type_or_obj=_SENTINEL, framedepth=1):
         for typ in mro:
             #  Find the class that owns the currently-executing method.
             for meth in typ.__dict__.values():
-                if isinstance(meth, FunctionType):
-                    if meth.func_code is f.f_code:
-                        break   # Aha!  Found you.
-                elif isinstance(meth, staticmethod):
-                    if meth.__func__.func_code is f.f_code:
-                        break   # Aha!  Found you.
+                # Drill down through any wrappers to the underlying func.
+                # This handles e.g. classmethod() and staticmethod().
+                try:
+                    while not isinstance(meth,FunctionType):
+                        try:
+                            meth = meth.__func__
+                        except AttributeError:
+                            meth = meth.__get__(type_or_obj)
+                except (AttributeError, TypeError):
+                    continue
+                if meth.func_code is f.f_code:
+                    break   # Aha!  Found you.
             else:
                 continue    #  Not found! Move onto the next class in MRO.
             break    #  Found! Break out of the search loop.

future/tests/test_magicsuper.py

@@ -8,7 +8,7 @@
 import future.builtins.newsuper
 from future.builtins import super
 from future.tests.base import unittest
-from future.utils import PY2
+from future import utils
 
 
 class TestMagicSuper(unittest.TestCase):
@@ -51,6 +51,7 @@ def other(self):
         ss = SubSub()
         self.assertEquals(ss.hello(),"hello world")
 
+    @unittest.skipIf(utils.PY3, "this test isn't relevant on Py3")
     def test_fails_for_oldstyle_class(self):
         class OldStyle:
             def testme(self):
@@ -72,7 +73,7 @@ def assertSuperEquals(self,sobj1,sobj2):
         assert sobj1.__thisclass__ is sobj2.__thisclass__
 
     def test_call_with_args_does_nothing(self):
-        if PY2:
+        if utils.PY2:
             from __builtin__ import super as builtin_super
         else:
             from builtins import super as builtin_super
@@ -93,6 +94,7 @@ def calc(self,value):
             self.assertSuperEquals(builtin_super(cls), super(cls))
             self.assertSuperEquals(builtin_super(cls,obj), super(cls,obj))
 
+    @unittest.skipIf(utils.PY3, "this test isn't relevant for Py3's super()")
     def test_superm(self):
         class Base(object):
             def getit(self):