Merge pull request #311 from bluetech/py36-pyupgrade

Run pyupgrade --py36

Author: bluetech

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import sys
 
 if sys.version_info >= (3, 8):
@@ -26,7 +25,7 @@
 # General information about the project.
 
 project = "pluggy"
-copyright = u"2016, Holger Krekel"
+copyright = "2016, Holger Krekel"
 author = "Holger Krekel"
 
 release = metadata.version(project)
@@ -58,7 +57,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "pluggy", u"pluggy Documentation", [author], 1)]
+man_pages = [(master_doc, "pluggy", "pluggy Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -70,7 +69,7 @@
     (
         master_doc,
         "pluggy",
-        u"pluggy Documentation",
+        "pluggy Documentation",
         author,
         "pluggy",
         "One line description of project.",

src/pluggy/_tracing.py

@@ -22,10 +22,10 @@ def _format_message(self, tags, args):
         content = " ".join(map(str, args))
         indent = "  " * self.indent
 
-        lines = ["%s%s [%s]\n" % (indent, content, ":".join(tags))]
+        lines = ["{}{} [{}]\n".format(indent, content, ":".join(tags))]
 
         for name, value in extra.items():
-            lines.append("%s    %s: %s\n" % (indent, name, value))
+            lines.append(f"{indent}    {name}: {value}\n")
 
         return "".join(lines)
 

src/pluggy/callers.py

@@ -25,7 +25,7 @@ def _multicall(hook_name, hook_impls, caller_kwargs, firstresult):
                     for argname in hook_impl.argnames:
                         if argname not in caller_kwargs:
                             raise HookCallError(
-                                "hook call must provide argument %r" % (argname,)
+                                f"hook call must provide argument {argname!r}"
                             )
 
                 if hook_impl.hookwrapper:

src/pluggy/hooks.py

@@ -214,7 +214,7 @@ def remove(wrappers):
 
         if remove(self._wrappers) is None:
             if remove(self._nonwrappers) is None:
-                raise ValueError("plugin %r not found" % (plugin,))
+                raise ValueError(f"plugin {plugin!r} not found")
 
     def get_hookimpls(self):
         # Order is important for _hookexec
@@ -240,7 +240,7 @@ def _add_hookimpl(self, hookimpl):
             methods.insert(i + 1, hookimpl)
 
     def __repr__(self):
-        return "<_HookCaller %r>" % (self.name,)
+        return f"<_HookCaller {self.name!r}>"
 
     def __call__(self, *args, **kwargs):
         if args:
@@ -314,7 +314,7 @@ def __init__(self, plugin, plugin_name, function, hook_impl_opts):
         self.__dict__.update(hook_impl_opts)
 
     def __repr__(self):
-        return "<HookImpl plugin_name=%r, plugin=%r>" % (self.plugin_name, self.plugin)
+        return f"<HookImpl plugin_name={self.plugin_name!r}, plugin={self.plugin!r}>"
 
 
 class HookSpec:

src/pluggy/manager.py

@@ -177,7 +177,7 @@ def add_hookspecs(self, module_or_class):
 
         if not names:
             raise ValueError(
-                "did not find any %r hooks in %r" % (self.project_name, module_or_class)
+                f"did not find any {self.project_name!r} hooks in {module_or_class!r}"
             )
 
     def parse_hookspec_opts(self, module_or_class, name):
@@ -369,4 +369,4 @@ def subset_hook_caller(self, name, remove_plugins):
 
 
 def _formatdef(func):
-    return "%s%s" % (func.__name__, inspect.signature(func))
+    return f"{func.__name__}{inspect.signature(func)}"

testing/test_details.py

@@ -131,5 +131,5 @@ def myhook(self):
     plugin = Plugin()
     pname = pm.register(plugin)
     assert repr(pm.hook.myhook._nonwrappers[0]) == (
-        "<HookImpl plugin_name=%r, plugin=%r>" % (pname, plugin)
+        f"<HookImpl plugin_name={pname!r}, plugin={plugin!r}>"
     )