[webkitcorepy] Add hybridmethod decorator

JonWBedard · JonWBedard · commit 62f8121903ef · 2021-07-29T02:31:53.000Z
https://bugs.webkit.org/show_bug.cgi?id=225991 <rdar://problem/78230701> Reviewed by Dewei Zhu. * Scripts/libraries/webkitcorepy/setup.py: Bump version. * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto. * Scripts/libraries/webkitcorepy/webkitcorepy/decorators.py: (hybridmethod): Similar to the "classmethod" decorator, except this decorator allows the decorated functions to differentiate between being called by the class and an instance of the class. * Scripts/libraries/webkitcorepy/webkitcorepy/tests/decorators_unittest.py: (TestHybrid): (TestHybrid.is_type): (TestHybrid.test_type): (TestHybrid.test_instance): Canonical link: https://commits.webkit.org/240053@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280413 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,23 @@
+2021-07-28  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitcorepy] Add hybridmethod decorator
+        https://bugs.webkit.org/show_bug.cgi?id=225991
+        <rdar://problem/78230701>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/decorators.py:
+        (hybridmethod): Similar to the "classmethod" decorator, except this decorator allows the
+        decorated functions to differentiate between being called by the class and an instance
+        of the class.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/tests/decorators_unittest.py:
+        (TestHybrid):
+        (TestHybrid.is_type):
+        (TestHybrid.test_type):
+        (TestHybrid.test_instance):
+
 2021-07-28  Jonathan Bedard  <jbedard@apple.com>
 
         [webkitcorepy] Fix race condition in TaskPool unittests (follow-up fix)
diff --git a/Tools/Scripts/libraries/webkitcorepy/setup.py b/Tools/Scripts/libraries/webkitcorepy/setup.py
@@ -30,7 +30,7 @@ def readme():
 
 setup(
     name='webkitcorepy',
-    version='0.7.1',
+    version='0.7.2',
     description='Library containing various Python support classes and functions.',
     long_description=readme(),
     classifiers=[
diff --git a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py b/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
@@ -39,7 +39,7 @@
 from webkitcorepy.measure_time import MeasureTime
 from webkitcorepy.nested_fuzzy_dict import NestedFuzzyDict
 
-version = Version(0, 7, 1)
+version = Version(0, 7, 2)
 
 from webkitcorepy.autoinstall import Package, AutoInstall
 if sys.version_info > (3, 0):
diff --git a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/decorators.py b/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/decorators.py
@@ -64,3 +64,21 @@ def decorator(*args, **kwargs):
     def clear(self):
         self._cache = defaultdict(dict)
         self._last_called = defaultdict(dict)
+
+
+class hybridmethod(object):
+    def __init__(self, function):
+        self.function = function
+
+    def __get__(self, obj, cls):
+        context = obj if obj is not None else cls
+
+        def wrapper(*args, **kwargs):
+            return self.function(context, *args, **kwargs)
+
+        wrapper.__name__ = self.function.__name__
+        wrapper.__doc__ = self.function.__doc__
+        wrapper.__func__ = wrapper.im_func = self.function
+        wrapper.__self__ = wrapper.im_self = context
+
+        return wrapper
diff --git a/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/decorators_unittest.py b/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/decorators_unittest.py
@@ -120,3 +120,16 @@ def test_override(self):
         self.assertEqual(TestMemoize.increment_with_arg(arg='x'), 1)
         self.assertEqual(TestMemoize.increment_with_arg(arg='x'), 2)
         self.assertEqual(TestMemoize.increment_with_arg(arg='x', cached=True), 2)
+
+
+class TestHybrid(unittest.TestCase):
+
+    @decorators.hybridmethod
+    def is_type(context):
+        return isinstance(context, type)
+
+    def test_type(self):
+        self.assertTrue(TestHybrid.is_type())
+
+    def test_instance(self):
+        self.assertFalse(self.is_type())
