Reformat and cleanup some more py2 code.

ionelmc · ionelmc · commit 00a7af890d05 · 2022-10-26T12:49:21.000+03:00
diff --git a/src/lazy_object_proxy/__init__.py b/src/lazy_object_proxy/__init__.py
@@ -20,4 +20,4 @@
 except ImportError:
     __version__ = '1.7.1'
 
-__all__ = "Proxy",
+__all__ = ("Proxy",)
diff --git a/src/lazy_object_proxy/compat.py b/src/lazy_object_proxy/compat.py
@@ -1,12 +1,4 @@
-import sys
-
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    string_types = str, bytes
-else:
-    string_types = basestring,  # noqa: F821
+string_types = str, bytes
 
 
 def with_metaclass(meta, *bases):
diff --git a/src/lazy_object_proxy/simple.py b/src/lazy_object_proxy/simple.py
@@ -96,15 +96,10 @@ def __wrapped__(self):
     def __repr__(self, __getattr__=object.__getattribute__):
         if '__wrapped__' in self.__dict__:
             return '<{} at 0x{:x} wrapping {!r} at 0x{:x} with factory {!r}>'.format(
-                type(self).__name__, id(self),
-                self.__wrapped__, id(self.__wrapped__),
-                self.__factory__
+                type(self).__name__, id(self), self.__wrapped__, id(self.__wrapped__), self.__factory__
             )
         else:
-            return '<{} at 0x{:x} with factory {!r}>'.format(
-                type(self).__name__, id(self),
-                self.__factory__
-            )
+            return '<{} at 0x{:x} with factory {!r}>'.format(type(self).__name__, id(self), self.__factory__)
 
     def __fspath__(self):
         wrapped = self.__wrapped__
diff --git a/src/lazy_object_proxy/slots.py b/src/lazy_object_proxy/slots.py
@@ -94,8 +94,7 @@ def __resolved__(self, __getattr__=object.__getattribute__):
             return True
 
     @property
-    def __wrapped__(self, __getattr__=object.__getattribute__, __setattr__=object.__setattr__,
-                    __delattr__=object.__delattr__):
+    def __wrapped__(self, __getattr__=object.__getattribute__, __setattr__=object.__setattr__, __delattr__=object.__delattr__):
         try:
             return __getattr__(self, '__target__')
         except AttributeError:
@@ -146,22 +145,18 @@ def __str__(self):
         return str(self.__wrapped__)
 
     if PY3:
+
         def __bytes__(self):
             return bytes(self.__wrapped__)
 
     def __repr__(self, __getattr__=object.__getattribute__):
         try:
             target = __getattr__(self, '__target__')
         except AttributeError:
-            return '<{} at 0x{:x} with factory {!r}>'.format(
-                type(self).__name__, id(self),
-                self.__factory__
-            )
+            return '<{} at 0x{:x} with factory {!r}>'.format(type(self).__name__, id(self), self.__factory__)
         else:
             return '<{} at 0x{:x} wrapping {!r} at 0x{:x} with factory {!r}>'.format(
-                type(self).__name__, id(self),
-                target, id(target),
-                self.__factory__
+                type(self).__name__, id(self), target, id(target), self.__factory__
             )
 
     def __fspath__(self):
@@ -179,6 +174,7 @@ def __reversed__(self):
         return reversed(self.__wrapped__)
 
     if PY3:
+
         def __round__(self):
             return round(self.__wrapped__)
 
@@ -379,6 +375,7 @@ def __int__(self):
         return int(self.__wrapped__)
 
     if PY2:
+
         def __long__(self):
             return long(self.__wrapped__)  # noqa
 
diff --git a/src/lazy_object_proxy/utils.py b/src/lazy_object_proxy/utils.py
@@ -1,13 +1,48 @@
- # flake8: noqa
-try:
-    from .utils_py3 import __aenter__
-    from .utils_py3 import __aexit__
-    from .utils_py3 import __aiter__
-    from .utils_py3 import __anext__
-    from .utils_py3 import __await__
-    from .utils_py3 import await_
-except (ImportError, SyntaxError):
-    await_ = None
+from collections.abc import Awaitable
+from inspect import CO_ITERABLE_COROUTINE
+from types import CoroutineType
+from types import GeneratorType
+
+
+async def do_await(obj):
+    return await obj
+
+
+def do_yield_from(gen):
+    return (yield from gen)
+
+
+def await_(obj):
+    obj_type = type(obj)
+    if (
+        obj_type is CoroutineType
+        or obj_type is GeneratorType
+        and bool(obj.gi_code.co_flags & CO_ITERABLE_COROUTINE)
+        or isinstance(obj, Awaitable)
+    ):
+        return do_await(obj).__await__()
+    else:
+        return do_yield_from(obj)
+
+
+def __aiter__(self):
+    return self.__wrapped__.__aiter__()
+
+
+async def __anext__(self):
+    return await self.__wrapped__.__anext__()
+
+
+def __await__(self):
+    return await_(self.__wrapped__)
+
+
+def __aenter__(self):
+    return self.__wrapped__.__aenter__()
+
+
+def __aexit__(self, *args, **kwargs):
+    return self.__wrapped__.__aexit__(*args, **kwargs)
 
 
 def identity(obj):
diff --git a/src/lazy_object_proxy/utils_py3.py b/src/lazy_object_proxy/utils_py3.py
diff --git a/tests/compat.py b/tests/compat.py
@@ -5,10 +5,12 @@
 
 if PY3:
     import builtins
+
     exec_ = getattr(builtins, "exec")
     del builtins
 
 else:
+
     def exec_(_code_, _globs_=None, _locs_=None):
         """Execute code in a namespace."""
         if _globs_ is None:
@@ -21,6 +23,8 @@ def exec_(_code_, _globs_=None, _locs_=None):
             _locs_ = _globs_
         exec("""exec _code_ in _globs_, _locs_""")
 
-    exec_("""def reraise(tp, value, tb=None):
+    exec_(
+        """def reraise(tp, value, tb=None):
     raise tp, value, tb
-""")
+"""
+    )
diff --git a/tests/test_async_py3.py b/tests/test_async_py3.py
diff --git a/tests/test_lazy_object_proxy.py b/tests/test_lazy_object_proxy.py
