Apply suggestions from code review

Co-authored-by: Colin Watson <[email protected]>

Author: Michael Howitz

src/zope/publisher/browser.py

@@ -229,7 +229,7 @@ def __repr__(self):
         items = list(self.__dict__.items())
         items.sort()
         return ("{"
-                + ", ".join(["{}: {}".format(key, repr(value))
+                + ", ".join(["{}: {!r}".format(key, value)
                              for key, value in items]) + "}")
 
 

src/zope/publisher/interfaces/__init__.py

@@ -86,7 +86,7 @@ def __str__(self):
             ob = repr(self.ob)
         except:   # noqa: E722 do not use bare 'except'
             ob = 'unprintable object'
-        return 'Object: {}, name: {}'.format(ob, repr(self.name))
+        return 'Object: {}, name: {!r}'.format(ob, self.name)
 
 
 class IDebugError(ITraversalException):

src/zope/publisher/tests/test_http.py

@@ -208,7 +208,7 @@ class Item:
             """Required docstring for the publisher."""
 
             def __call__(self, a, b):
-                return ("{}, {}".format(repr(a), repr(b))).encode('latin1')
+                return ("{!r}, {!r}".format(a, b)).encode('latin1')
 
         self.app = AppRoot()
         self.app.folder = Folder()

src/zope/publisher/tests/test_xmlrpcrequest.py

@@ -82,7 +82,7 @@ class Folder:
         class Item:
 
             def __call__(self, a, b):
-                return "{}, {}".format(repr(a), repr(b))
+                return "{!r}, {!r}".format(a, b)
 
             def doit(self, a, b):
                 return 'do something {} {}'.format(a, b)