Fix bug with __index__ - failure seen on pypy3.8.

ionelmc · ionelmc · commit 3d23e5ed81ae · 2021-12-15T00:57:58.000+02:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -11,6 +11,10 @@ Changelog
     Python 2 specific handling will be removed at some point.
   * Linux wheels are now provided in `musllinux` and `manylinux2014` variants.
 
+* Fixed ``__index__`` to fallback to ``int`` if the wrapped object doesn't have an ``__index__`` method.
+  This prevents situations where code using a proxy would otherwise likely just call ``int`` had the object
+  not have an ``__index__`` method.
+
 1.6.0 (2021-03-22)
 ------------------
 
diff --git a/src/lazy_object_proxy/simple.py b/src/lazy_object_proxy/simple.py
@@ -233,7 +233,13 @@ def __ror__(self, other):
     __float__ = make_proxy_method(float)
     __oct__ = make_proxy_method(oct)
     __hex__ = make_proxy_method(hex)
-    __index__ = make_proxy_method(operator.index)
+
+    def __index__(self):
+        if hasattr(self.__wrapped__, '__index__'):
+            return operator.index(self.__wrapped__)
+        else:
+            return int(self.__wrapped__)
+
     __len__ = make_proxy_method(len)
     __contains__ = make_proxy_method(operator.contains)
     __getitem__ = make_proxy_method(operator.getitem)
diff --git a/src/lazy_object_proxy/slots.py b/src/lazy_object_proxy/slots.py
@@ -392,7 +392,10 @@ def __hex__(self):
         return hex(self.__wrapped__)
 
     def __index__(self):
-        return operator.index(self.__wrapped__)
+        if hasattr(self.__wrapped__, '__index__'):
+            return operator.index(self.__wrapped__)
+        else:
+            return int(self.__wrapped__)
 
     def __len__(self):
         return len(self.__wrapped__)
