- incorporate suggestions and remove changes I am not sure about myself

3 files changed, 12 insertions, 15 deletions

diff --git a/src/zope/proxy/__init__.py b/src/zope/proxy/__init__.py
index 43202b9..dfccbea 100644
--- a/src/zope/proxy/__init__.py
+++ b/src/zope/proxy/__init__.py
@@ -123,9 +123,6 @@ class AbstractPyProxyBase:
     def __str__(self):
         return str(self._wrapped)
 
-    def __bytes__(self):
-        return bytes(self._wrapped)
-
     def __reduce__(self):  # pragma: no cover  (__reduce_ex__ prevents normal)
         raise pickle.PicklingError
 
@@ -258,8 +255,10 @@ class AbstractPyProxyBase:
     def __next__(self):
         return self._wrapped.__next__()
 
-    def __reversed__(self):
-        return reversed(self._wrapped)
+    # Python 2.7 won't let the C wrapper support __reversed__
+    # Uncomment this when the supported Python versions do
+    # def __reversed__(self):
+    #    return reversed(self._wrapped)
 
     def __contains__(self, item):
         return item in self._wrapped
@@ -284,8 +283,10 @@ class AbstractPyProxyBase:
     def __int__(self):
         return int(self._wrapped)
 
-    def __long__(self):  # Must stick around until zope.security is fixed
-        return int(self._wrapped)
+    # BBB Should go away after zope.security is fixed
+    # see https://github.com/zopefoundation/zope.security/issues/92
+    def __long__(self):
+        return long(self._wrapped)  # noqa: F821 undefined name
 
     def __float__(self):
         return float(self._wrapped)
diff --git a/src/zope/proxy/_zope_proxy_proxy.c b/src/zope/proxy/_zope_proxy_proxy.c
index 3bfaa3b..d2cc20b 100644
--- a/src/zope/proxy/_zope_proxy_proxy.c
+++ b/src/zope/proxy/_zope_proxy_proxy.c
@@ -187,11 +187,8 @@ WrapperType_Lookup(PyTypeObject *type, PyObject *name)
         base = PyTuple_GET_ITEM(mro, i);
 
         if (((PyTypeObject *)base) != &ProxyType) {
-            {
-                assert(PyType_Check(base));
-                dict = ((PyTypeObject *)base)->tp_dict;
-            }
-
+            assert(PyType_Check(base));
+            dict = ((PyTypeObject *)base)->tp_dict;
             assert(dict && PyDict_Check(dict));
             res = PyDict_GetItem(dict, name);
             if (res != NULL)
diff --git a/src/zope/proxy/tests/test_proxy.py b/src/zope/proxy/tests/test_proxy.py
index 2f52ae6..f7a7687 100644
--- a/src/zope/proxy/tests/test_proxy.py
+++ b/src/zope/proxy/tests/test_proxy.py
@@ -518,8 +518,7 @@ class PyProxyBaseTestCase(unittest.TestCase):
             y = eval(expr)
             x = self._makeOne(1)
             z = eval(expr)
-            self.assertEqual(z, y,
-                             "x={!r}; expr={!r}".format(x, expr))
+            self.assertEqual(z, y, f'x={x!r}; expr={expr!r}')
 
     def test_odd_unops(self):
         # unops that don't return a proxy
@@ -542,7 +541,7 @@ class PyProxyBaseTestCase(unittest.TestCase):
                         z = eval(expr)
                         first = 0
                     else:
-                        msg = "x={!r}; y={!r}; expr={!r}".format(x, y, expr)
+                        msg = f'x={x!r}; y={y!r}; expr={expr!r}'
                         self.assertEqual(eval(expr), z, msg)
 
     def test_pow_w_modulus(self):