From c659bccc38e9d6d0b17623d851ec9970ad765b09 Mon Sep 17 00:00:00 2001
From: brettlangdon <brett.langdon@datadoghq.com>
Date: Mon, 9 Mar 2020 13:30:43 -0400
Subject: [PATCH] Revert "Use .format() instead of f-strings"

This reverts commit 942e8d78bc1d1263c6bc49b9fcb3db5bc325bd3e.
---
 importhook/finder.py   | 13 ++-----------
 importhook/loader.py   | 27 ++++-----------------------
 importhook/registry.py | 18 +++---------------
 3 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/importhook/finder.py b/importhook/finder.py
index d1fcc3b..c016e76 100644
--- a/importhook/finder.py
+++ b/importhook/finder.py
@@ -27,12 +27,7 @@ def hook_finder(finder):
     def wrap_find_spec(find_spec):
         @functools.wraps(find_spec)
         def wrapper(fullname, path, target=None):
-            logger.debug('{}.find_spec(fullname={}, path={}, target={})'.format(
-                finder_name,
-                fullname,
-                path,
-                target,
-            ))
+            logger.debug(f'{finder_name}.find_spec(fullname={fullname}, path={path}, target={target})')
             spec = find_spec(fullname, path, target=target)
             if spec is not None:
                 spec.loader = HookLoader(spec.loader)
@@ -42,11 +37,7 @@ def hook_finder(finder):
     def wrap_find_loader(find_loader):
         @functools.wraps(find_loader)
         def wrapper(fullname, path):
-            logger.debug('{}.find_loader(fullname={}, path={})'.format(
-                finder_name,
-                fullname,
-                path,
-            ))
+            logger.debug(f'{finder_name}.find_loader(fullname={fullname}, path={path})')
             loader = find_loader(fullname, path)
             return HookLoader(loader)
         return wrapper
diff --git a/importhook/loader.py b/importhook/loader.py
index 9661c03..f2d1590 100644
--- a/importhook/loader.py
+++ b/importhook/loader.py
@@ -49,23 +49,14 @@ class HookLoader(Loader):
         raise AttributeError
 
     def create_module(self, *args, **kwargs):
-        logger.debug('{}.create_module(*args={}, **kwargs={})'.format(
-            self.__class__.__name__,
-            args,
-            kwargs,
-        ))
+        logger.debug(f'{self.__class__.__name__}.create_module(*args={args}, **kwargs={kwargs})')
         if not hasattr(self.loader, 'create_module'):
             return None
 
         return self.loader.create_module(*args, **kwargs)
 
     def find_module(self, name, *args, **kwargs):
-        logger.debug('{}.find_module(name={}, *args={}, **kwargs={})'.format(
-            self.__class__.__name__,
-            name,
-            args,
-            kwargs,
-        ))
+        logger.debug(f'{self.__class__.__name__}.find_module(name={name}, *args={args}, **kwargs={kwargs})')
         if not hasattr(self.loader, 'find_module'):
             return None
 
@@ -76,12 +67,7 @@ class HookLoader(Loader):
         return module
 
     def load_module(self, name, *args, **kwargs):
-        logger.debug('{}.load_module(name={}, *args={}, **kwargs={})'.format(
-            self.__class__.__name__,
-            name,
-            args,
-            kwargs,
-        ))
+        logger.debug(f'{self.__class__.__name__}.load_module(name={name}, *args={args}, **kwargs={kwargs})')
         if not hasattr(self.loader, 'load_module'):
             return None
 
@@ -92,12 +78,7 @@ class HookLoader(Loader):
         return module
 
     def exec_module(self, module, *args, **kwargs):
-        logger.debug('{}.exec_module(module={}, *args={}, **kwargs={})'.format(
-            self.__class__.__name__,
-            module,
-            args,
-            kwargs,
-        ))
+        logger.debug(f'{self.__class__.__name__}.exec_module(module={module}, *args={args}, **kwargs={kwargs})')
         if not hasattr(self.loader, 'exec_module'):
             return None
 
diff --git a/importhook/registry.py b/importhook/registry.py
index 02ce12d..f880e70 100644
--- a/importhook/registry.py
+++ b/importhook/registry.py
@@ -7,11 +7,7 @@ class Hooks(set):
     """Custom set that is used to maintain and call a list of hooks"""
     def __call__(self, module):
         for hook in self:
-            logger.debug('Calling hook {}:{}({})'.format(
-                hook.__module__,
-                hook.__name__,
-                module,
-            ))
+            logger.debug(f'Calling hook {hook.__module__}:{hook.__name__}({module})')
             mod = hook(module)
             # If they modified the module, then use that instead
             if mod is not None:
@@ -26,11 +22,7 @@ class HookRegistry(dict):
 
     def __setitem__(self, key, hook):
         module_name = key or 'ANY_MODULE'
-        logger.debug('Registering hook {}:{} for {}'.format(
-            hook.__module__,
-            hook.__name__,
-            module_name,
-        ))
+        logger.debug(f'Registering hook {hook.__module__}:{hook.__name__} for {module_name}')
 
         # Ensure we have a key for this module and it's value is a `Hooks` set
         if key not in self:
@@ -42,11 +34,7 @@ class HookRegistry(dict):
         # Call hook for a module which has already been loaded
         if key is not None and key in sys.modules:
             module = sys.modules[key]
-            logger.debug('Calling hook {}:{}({})'.format(
-                hook.__module__,
-                hook.__name__,
-                module,
-            ))
+            logger.debug(f'Calling hook {hook.__module__}:{hook.__name__}({module})')
 
             module = hook(sys.modules[key])
             if module is not None: