- run pyupgrade and fix pypy3 doctests (from 2bb0ee6)

src/zope/interface/common/__init__.py

@@ -167,7 +167,7 @@ def __optional_methods_to_docs(attrs):
             return ''
 
         docs = "\n\nThe following methods are optional:\n - " + "\n-".join(
-            "{}\n{}".format(k, v.__doc__) for k, v in optionals.items()
+            f"{k}\n{v.__doc__}" for k, v in optionals.items()
         )
         return docs
 
@@ -181,7 +181,7 @@ def ref(c):
                 return "`%s`" % name
             if mod == '_io':
                 mod = 'io'
-            return "`{}.{}`".format(mod, name)
+            return f"`{mod}.{name}`"
 
         implementations_doc = "\n - ".join(
             ref(c)

src/zope/interface/declarations.py

@@ -348,7 +348,7 @@ def __repr__(self):
         declared_names = self._argument_names_for_repr(self.declared)
         if declared_names:
             declared_names = ', ' + declared_names
-        return 'classImplements({}{})'.format(name, declared_names)
+        return f'classImplements({name}{declared_names})'
 
     def __reduce__(self):
         return implementedBy, (self.inherit, )
@@ -772,7 +772,7 @@ def __repr__(self):
             if len(mod_names) == 1:
                 mod_names = "sys.modules[%r]" % mod_names[0]
             ordered_names = (
-                '{}, '.format(mod_names)
+                f'{mod_names}, '
             ) + ordered_names
         return "{}({})".format(
             function_name,
@@ -937,7 +937,7 @@ def __repr__(self):
         # Thus, as our repr, we go with the ``directlyProvides()`` syntax.
         interfaces = (self._cls, ) + self.__args[2:]
         ordered_names = self._argument_names_for_repr(interfaces)
-        return "directlyProvides({})".format(ordered_names)
+        return f"directlyProvides({ordered_names})"
 
     def __reduce__(self):
         return self.__class__, self.__args

src/zope/interface/document.py

@@ -35,7 +35,7 @@ def asStructuredText(iface, munge=0, rst=False):
 
     if rst:
         def inline_literal(s):
-            return "``{}``".format(s)
+            return f"``{s}``"
     else:
         def inline_literal(s):
             return s
@@ -76,7 +76,7 @@ def inline_literal(s):
     level += 1
     for name, desc in namesAndDescriptions:
         if hasattr(desc, 'getSignatureString'):   # ugh...
-            _call = "{}{}".format(desc.getName(), desc.getSignatureString())
+            _call = f"{desc.getName()}{desc.getSignatureString()}"
             item = "{} -- {}".format(
                 inline_literal(_call),
                 desc.getDoc() or 'no documentation'

src/zope/interface/exceptions.py

@@ -93,7 +93,7 @@ def _str_subject(self):
         target = self.target
         if target is self._NOT_GIVEN:
             return "An object"
-        return "The object {!r}".format(target)
+        return f"The object {target!r}"
 
     @property
     def _str_description(self):

src/zope/interface/interface.py

@@ -793,7 +793,7 @@ def __init__(
         Specification.__init__(self, bases)
         self.__attrs = self.__compute_attrs(attrs)
 
-        self.__identifier__ = "{}.{}".format(__module__, name)
+        self.__identifier__ = f"{__module__}.{name}"
 
     def __compute_attrs(self, attrs):
         # Make sure that all recorded attributes (and methods) are of type
@@ -938,15 +938,15 @@ def __repr__(self):
             return self._v_repr
         except AttributeError:
             name = str(self)
-            r = "<{} {}>".format(self.__class__.__name__, name)
+            r = f"<{self.__class__.__name__} {name}>"
             self._v_repr = r  # pylint:disable=attribute-defined-outside-init
             return r
 
     def __str__(self):
         name = self.__name__
         m = self.__ibmodule__
         if m:
-            name = '{}.{}'.format(m, name)
+            name = f'{m}.{name}'
         return name
 
     def _call_conform(self, conform):

src/zope/interface/interfaces.py

@@ -1157,7 +1157,7 @@ class RegistrationEvent(ObjectEvent):
     """There has been a change in a registration
     """
     def __repr__(self):
-        return "{} event:\n{!r}".format(self.__class__.__name__, self.object)
+        return f"{self.__class__.__name__} event:\n{self.object!r}"
 
 
 class IRegistered(IRegistrationEvent):

src/zope/interface/registry.py

@@ -166,7 +166,7 @@ def __init__(self, name='', bases=()):
         self._v_utility_registrations_cache = None
 
     def __repr__(self):
-        return "<{} {}>".format(self.__class__.__name__, self.__name__)
+        return f"<{self.__class__.__name__} {self.__name__}>"
 
     def __reduce__(self):
         # Mimic what a persistent.Persistent object does and elide

src/zope/interface/ro.py

@@ -625,7 +625,7 @@ def __str__(self):
         max_left = max(len(x) for x in left_lines)
         max_right = max(len(x) for x in right_lines)
 
-        left_title = 'Legacy RO (len={})'.format(len(self.legacy_ro))
+        left_title = f'Legacy RO (len={len(self.legacy_ro)})'
 
         right_title = 'C3 RO (len={}; inconsistent={})'.format(
             len(self.c3_ro),

src/zope/interface/tests/odd.py

@@ -92,7 +92,7 @@ def __getattr__(self, name):
         raise AttributeError(name)
 
     def __repr__(self):  # pragma: no cover
-        return "<odd class {} at {}>".format(self.__name__, hex(id(self)))
+        return f"<odd class {self.__name__} at {hex(id(self))}>"
 
 
 MetaClass = MetaMetaClass(

src/zope/interface/tests/test_declarations.py

@@ -1357,7 +1357,7 @@ def test__repr__(self):
         IFoo = InterfaceClass("IFoo")
         assert IFoo.__name__ == 'IFoo'
         assert IFoo.__module__ == __name__
-        assert repr(IFoo) == '<InterfaceClass {}.IFoo>'.format(__name__)
+        assert repr(IFoo) == f'<InterfaceClass {__name__}.IFoo>'
 
         IBar = InterfaceClass("IBar")
 
@@ -1968,7 +1968,7 @@ def __call__(self):
         inst = implementedBy(Callable())
         self.assertEqual(
             repr(inst),
-            'classImplements({}.?)'.format(__name__)
+            f'classImplements({__name__}.?)'
         )
 
         c = Callable()

src/zope/interface/tests/test_registry.py

@@ -2610,7 +2610,7 @@ class UtilityImplementingFoo:
 
         for i in range(30):
             comps.registerUtility(
-                UtilityImplementingFoo(), IFoo, name='{}'.format(i)
+                UtilityImplementingFoo(), IFoo, name=f'{i}'
             )
 
         orig_generation = comps.utilities._generation