From b2454c0cbdcaf36a7111b51f91c761bbc2c99a2f Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Mon, 1 Mar 2021 15:08:39 -0800
Subject: [PATCH] fix: don't set attr on bound method

---
 playwright/_impl/_impl_to_api_mapping.py | 27 ++++++++++++++++++------
 setup.py                                 |  1 +
 tests/async/test_network.py              | 14 ++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/playwright/_impl/_impl_to_api_mapping.py b/playwright/_impl/_impl_to_api_mapping.py
index 807eee632..a26d904ef 100644
--- a/playwright/_impl/_impl_to_api_mapping.py
+++ b/playwright/_impl/_impl_to_api_mapping.py
@@ -13,11 +13,13 @@
 # limitations under the License.
 
 import inspect
-from typing import Any, Callable, Dict, List, Optional
+from types import MethodType
+from typing import Any, Callable, Dict, List, Optional, cast
 
 from playwright._impl._api_types import Error
 
-INSTANCE_ATTR = "_pw_api_instance"
+API_ATTR = "_pw_api_instance_"
+IMPL_ATTR = "_pw_impl_instance_"
 
 
 class ImplWrapper:
@@ -41,10 +43,10 @@ def from_maybe_impl(self, obj: Any) -> Any:
             return [self.from_maybe_impl(item) for item in obj]
         api_class = self._mapping.get(type(obj))
         if api_class:
-            api_instance = getattr(obj, INSTANCE_ATTR, None)
+            api_instance = getattr(obj, API_ATTR, None)
             if not api_instance:
                 api_instance = api_class(obj)
-                setattr(obj, INSTANCE_ATTR, api_instance)
+                setattr(obj, API_ATTR, api_instance)
             return api_instance
         else:
             return obj
@@ -85,8 +87,21 @@ def wrapper_func(*args: Any) -> Any:
                 *list(map(lambda a: self.from_maybe_impl(a), args))[:arg_count]
             )
 
-        wrapper = getattr(handler, INSTANCE_ATTR, None)
+        if inspect.ismethod(handler):
+            wrapper = getattr(
+                cast(MethodType, handler).__self__, IMPL_ATTR + handler.__name__, None
+            )
+            if not wrapper:
+                wrapper = wrapper_func
+                setattr(
+                    cast(MethodType, handler).__self__,
+                    IMPL_ATTR + handler.__name__,
+                    wrapper,
+                )
+            return wrapper
+
+        wrapper = getattr(handler, IMPL_ATTR, None)
         if not wrapper:
             wrapper = wrapper_func
-        setattr(handler, INSTANCE_ATTR, wrapper)
+            setattr(handler, IMPL_ATTR, wrapper)
         return wrapper
diff --git a/setup.py b/setup.py
index c2721da96..cbbd59ed9 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@
 
 driver_version = "1.9.0-1614037901000"
 
+
 def extractall(zip: zipfile.ZipFile, path: str) -> None:
     for name in zip.namelist():
         member = zip.getinfo(name)
diff --git a/tests/async/test_network.py b/tests/async/test_network.py
index 9cb0a55a0..fab914e3d 100644
--- a/tests/async/test_network.py
+++ b/tests/async/test_network.py
@@ -73,6 +73,20 @@ async def test_page_events_request_should_fire_for_navigation_requests(
     assert len(requests) == 1
 
 
+async def test_page_events_request_should_accept_method(page: Page, server):
+    class Log:
+        def __init__(self):
+            self.requests = []
+
+        def handle(self, request):
+            self.requests.append(request)
+
+    log = Log()
+    page.on("request", log.handle)
+    await page.goto(server.EMPTY_PAGE)
+    assert len(log.requests) == 1
+
+
 async def test_page_events_request_should_fire_for_iframes(page, server, utils):
     requests = []
     page.on("request", lambda r: requests.append(r))