Upgrade Python syntax with pyupgrade --py37-plus

Author: hugovk

src/apipkg/__init__.py

@@ -155,7 +155,7 @@ def __init__(self, name, importspec, implprefix=None, attr=None):
                 setattr(self, name, val)
         for name, importspec in importspec.items():
             if isinstance(importspec, dict):
-                subname = "{}.{}".format(self.__name__, name)
+                subname = f"{self.__name__}.{name}"
                 apimod = ApiModule(subname, importspec, implprefix)
                 sys.modules[subname] = apimod
                 setattr(self, name, apimod)
@@ -167,7 +167,7 @@ def __init__(self, name, importspec, implprefix=None, attr=None):
                     modpath = implprefix + modpath
 
                 if not attrname:
-                    subname = "{}.{}".format(self.__name__, name)
+                    subname = f"{self.__name__}.{name}"
                     apimod = AliasModule(subname, modpath)
                     sys.modules[subname] = apimod
                     if "." not in name:
@@ -183,7 +183,7 @@ def __repr__(self):
             repr_list.append("from " + repr(self.__file__))
         if repr_list:
             return "<ApiModule {!r} {}>".format(self.__name__, " ".join(repr_list))
-        return "<ApiModule {!r}>".format(self.__name__)
+        return f"<ApiModule {self.__name__!r}>"
 
     @_synchronized
     def __makeattr(self, name, isgetattr=False):
@@ -210,7 +210,7 @@ def __makeattr(self, name, isgetattr=False):
             # * Only call __getattribute__ if there is a possibility something has set
             #   the attribute we're looking for since __getattr__ was called
             if threading is not None and isgetattr:
-                return super(ApiModule, self).__getattribute__(name)
+                return super().__getattribute__(name)
             raise AttributeError(name)
         else:
             result = importobj(modpath, attrname)
@@ -252,7 +252,7 @@ def getmod():
         return mod[0]
 
     x = modpath + ("." + attrname if attrname else "")
-    repr_result = "<AliasModule {!r} for {!r}>".format(modname, x)
+    repr_result = f"<AliasModule {modname!r} for {x!r}>"
 
     class AliasModule(ModuleType):
         def __repr__(self):

test_apipkg.py

@@ -254,10 +254,10 @@ def parsenamespace(spec):
             continue
         parts = [x.strip() for x in line.split()]
         if len(parts) != 2:
-            raise ValueError("Wrong format: {!r}".format(line))
+            raise ValueError(f"Wrong format: {line!r}")
         apiname, spec = parts
         if not spec.startswith("__"):
-            raise ValueError("{!r} does not start with __".format(spec))
+            raise ValueError(f"{spec!r} does not start with __")
         apinames = apiname.split(".")
         cur = ns
         for name in apinames[:-1]:
@@ -493,7 +493,7 @@ def init():
 
     class TestThread(threading.Thread):
         def __init__(self, event_start):
-            super(TestThread, self).__init__()
+            super().__init__()
             self.event_start = event_start
             self.lenl = None
 
@@ -544,7 +544,7 @@ def test_attribute_race(tmpdir, monkeypatch):
 
     class TestThread(threading.Thread):
         def __init__(self, event_start):
-            super(TestThread, self).__init__()
+            super().__init__()
             self.event_start = event_start
             self.attr = None
 
@@ -591,7 +591,7 @@ def test_import_race(tmpdir, monkeypatch):
 
     class TestThread(threading.Thread):
         def __init__(self):
-            super(TestThread, self).__init__()
+            super().__init__()
             self.importrace = None
 
         def run(self):