Cleanup more dead code.

ionelmc · ionelmc · commit 568599140dbf · 2022-10-26T14:20:57.000+03:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,7 @@ Changelog
 ------------------
 
 * Cleaned up use of cPickle. Contributed by Sandro Tosi in `#62 <https://github.com/ionelmc/python-lazy-object-proxy/pull/62>`_.
+* Cleaned up more dead Python 2 code.
 * Added Python 3.11 wheels.
 * Dropped support for Python 3.6.
 
diff --git a/conftest.py b/conftest.py
diff --git a/src/lazy_object_proxy/simple.py b/src/lazy_object_proxy/simple.py
@@ -1,7 +1,5 @@
 import operator
 
-from .compat import PY2
-from .compat import PY3
 from .compat import string_types
 from .compat import with_metaclass
 from .utils import await_
@@ -89,9 +87,7 @@ def __wrapped__(self):
     __annotations__ = property(make_proxy_method(operator.attrgetter('__anotations__')))
     __dir__ = make_proxy_method(dir)
     __str__ = make_proxy_method(str)
-
-    if PY3:
-        __bytes__ = make_proxy_method(bytes)
+    __bytes__ = make_proxy_method(bytes)
 
     def __repr__(self, __getattr__=object.__getattribute__):
         if '__wrapped__' in self.__dict__:
@@ -113,10 +109,7 @@ def __fspath__(self):
                 return fspath()
 
     __reversed__ = make_proxy_method(reversed)
-
-    if PY3:
-        __round__ = make_proxy_method(round)
-
+    __round__ = make_proxy_method(round)
     __lt__ = make_proxy_method(operator.lt)
     __le__ = make_proxy_method(operator.le)
     __eq__ = make_proxy_method(operator.eq)
@@ -148,7 +141,6 @@ def __delattr__(self, name):
     __add__ = make_proxy_method(operator.add)
     __sub__ = make_proxy_method(operator.sub)
     __mul__ = make_proxy_method(operator.mul)
-    __div__ = make_proxy_method(operator.div if PY2 else operator.truediv)
     __truediv__ = make_proxy_method(operator.truediv)
     __floordiv__ = make_proxy_method(operator.floordiv)
     __mod__ = make_proxy_method(operator.mod)
@@ -205,7 +197,6 @@ def __ror__(self, other):
     __iadd__ = make_proxy_method(operator.iadd)
     __isub__ = make_proxy_method(operator.isub)
     __imul__ = make_proxy_method(operator.imul)
-    __idiv__ = make_proxy_method(operator.idiv if PY2 else operator.itruediv)
     __itruediv__ = make_proxy_method(operator.itruediv)
     __ifloordiv__ = make_proxy_method(operator.ifloordiv)
     __imod__ = make_proxy_method(operator.imod)
@@ -219,12 +210,7 @@ def __ror__(self, other):
     __pos__ = make_proxy_method(operator.pos)
     __abs__ = make_proxy_method(operator.abs)
     __invert__ = make_proxy_method(operator.invert)
-
     __int__ = make_proxy_method(int)
-
-    if PY2:
-        __long__ = make_proxy_method(long)  # noqa
-
     __float__ = make_proxy_method(float)
     __oct__ = make_proxy_method(oct)
     __hex__ = make_proxy_method(hex)
@@ -241,11 +227,6 @@ def __index__(self):
     __setitem__ = make_proxy_method(operator.setitem)
     __delitem__ = make_proxy_method(operator.delitem)
 
-    if PY2:
-        __getslice__ = make_proxy_method(operator.getslice)
-        __setslice__ = make_proxy_method(operator.setslice)
-        __delslice__ = make_proxy_method(operator.delslice)
-
     def __enter__(self):
         return self.__wrapped__.__enter__()
 
diff --git a/src/lazy_object_proxy/slots.py b/src/lazy_object_proxy/slots.py
@@ -1,7 +1,5 @@
 import operator
 
-from .compat import PY2
-from .compat import PY3
 from .compat import string_types
 from .compat import with_metaclass
 from .utils import await_
@@ -144,10 +142,8 @@ def __dir__(self):
     def __str__(self):
         return str(self.__wrapped__)
 
-    if PY3:
-
-        def __bytes__(self):
-            return bytes(self.__wrapped__)
+    def __bytes__(self):
+        return bytes(self.__wrapped__)
 
     def __repr__(self, __getattr__=object.__getattribute__):
         try:
@@ -173,10 +169,8 @@ def __fspath__(self):
     def __reversed__(self):
         return reversed(self.__wrapped__)
 
-    if PY3:
-
-        def __round__(self):
-            return round(self.__wrapped__)
+    def __round__(self):
+        return round(self.__wrapped__)
 
     def __lt__(self, other):
         return self.__wrapped__ < other
@@ -232,9 +226,6 @@ def __sub__(self, other):
     def __mul__(self, other):
         return self.__wrapped__ * other
 
-    def __div__(self, other):
-        return operator.div(self.__wrapped__, other)
-
     def __truediv__(self, other):
         return operator.truediv(self.__wrapped__, other)
 
@@ -374,11 +365,6 @@ def __invert__(self):
     def __int__(self):
         return int(self.__wrapped__)
 
-    if PY2:
-
-        def __long__(self):
-            return long(self.__wrapped__)  # noqa
-
     def __float__(self):
         return float(self.__wrapped__)
 
diff --git a/tests/compat.py b/tests/compat.py
diff --git a/tests/test_lazy_object_proxy.py b/tests/test_lazy_object_proxy.py
@@ -13,9 +13,6 @@
 from functools import partial
 
 import pytest
-from compat import PY2
-from compat import PY3
-from compat import exec_
 
 PYPY = '__pypy__' in sys.builtin_module_names
 
@@ -32,7 +29,7 @@ def target():
 """
 
 objects = types.ModuleType('objects')
-exec_(OBJECTS_CODE, objects.__dict__, objects.__dict__)
+exec(OBJECTS_CODE, objects.__dict__, objects.__dict__)
 
 
 def test_round(lop):
@@ -72,8 +69,7 @@ def function1(*args, **kwargs):
     assert function2.__wrapped__ is function1
     assert function2.__name__ == function1.__name__
 
-    if PY3:
-        assert function2.__qualname__ == function1.__qualname__
+    assert function2.__qualname__ == function1.__qualname__
 
     function2.__wrapped__ = None
 
@@ -83,8 +79,7 @@ def function1(*args, **kwargs):
     assert function2.__wrapped__ is None
     assert not hasattr(function2, '__name__')
 
-    if PY3:
-        assert not hasattr(function2, '__qualname__')
+    assert not hasattr(function2, '__qualname__')
 
     def function3(*args, **kwargs):
         return args, kwargs
@@ -95,8 +90,7 @@ def function3(*args, **kwargs):
     assert function2.__wrapped__ == function3
     assert function2.__name__ == function3.__name__
 
-    if PY3:
-        assert function2.__qualname__ == function3.__qualname__
+    assert function2.__qualname__ == function3.__qualname__
 
 
 def test_wrapped_attribute(lop):
@@ -884,9 +878,6 @@ def test_int(lop):
 
     assert int(one) == 1
 
-    if not PY3:
-        assert long(one) == 1  # noqa
-
 
 def test_float(lop):
     one = lop.Proxy(lambda: 1)
@@ -1556,17 +1547,15 @@ def test_callable_proxy_is_callable(lop):
 
 
 def test_class_bytes(lop):
-    if PY3:
-
-        class Class(object):
-            def __bytes__(self):
-                return b'BYTES'
+    class Class(object):
+        def __bytes__(self):
+            return b'BYTES'
 
-        instance = Class()
+    instance = Class()
 
-        proxy = lop.Proxy(lambda: instance)
+    proxy = lop.Proxy(lambda: instance)
 
-        assert bytes(instance) == bytes(proxy)
+    assert bytes(instance) == bytes(proxy)
 
 
 def test_str_format(lop):
@@ -1606,14 +1595,7 @@ def test_fractions_round(lop):
 
 
 def test_readonly(lop):
-    class Foo(object):
-        if PY2:
-
-            @property
-            def __qualname__(self):
-                return 'object'
-
-    proxy = lop.Proxy(lambda: Foo() if PY2 else object)
+    proxy = lop.Proxy(lambda: object)
     assert proxy.__qualname__ == 'object'
 
 
