refactor: raise error on wrong unwrap

jd · Sep 21, 2021 · d38b82c · d38b82c
1 parent 8778651
commit d38b82c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/ddtrace/contrib/asyncio/patch.py b/ddtrace/contrib/asyncio/patch.py
@@ -31,10 +31,10 @@ def unpatch():
     if getattr(asyncio, "_datadog_patch", False):
         setattr(asyncio, "_datadog_patch", False)
 
-    if sys.version_info < (3, 7, 0):
-        _u(asyncio.BaseEventLoop, "create_task")
+        if sys.version_info < (3, 7, 0):
+            _u(asyncio.BaseEventLoop, "create_task")
 
-        # also unpatch event loop if not inheriting the already unwrapped create_task from BaseEventLoop
-        loop = asyncio.get_event_loop()
-        if isinstance(loop.create_task, ObjectProxy):
-            _u(loop, "create_task")
+            # also unpatch event loop if not inheriting the already unwrapped create_task from BaseEventLoop
+            loop = asyncio.get_event_loop()
+            if isinstance(loop.create_task, ObjectProxy):
+                _u(loop, "create_task")
diff --git a/ddtrace/utils/wrappers.py b/ddtrace/utils/wrappers.py
@@ -27,9 +27,8 @@ def iswrapped(obj, attr=None):
 
 def unwrap(obj, attr):
     # type: (Any, str) -> None
-    f = getattr(obj, attr, None)
-    if f and isinstance(f, wrapt.ObjectProxy) and hasattr(f, "__wrapped__"):
-        setattr(obj, attr, f.__wrapped__)
+    f = getattr(obj, attr)
+    setattr(obj, attr, f.__wrapped__)
 
 
 @deprecated("`wrapt` library is used instead", version="1.0.0")