pyupgrade: converts str.format() into f-strings.

Author: vdboor

fluent_pages/extensions/pagetypepool.py

@@ -136,7 +136,7 @@ def _get_plugin_by_content_type(self, contenttype):
             else:
                 ct_name = f"{ct.app_label}.{ct.model}"
             raise PageTypeNotFound(
-                "No plugin found for content type #{} ({}).".format(contenttype, ct_name)
+                f"No plugin found for content type #{contenttype} ({ct_name})."
             )
 
         return self.plugins[name]

fluent_pages/management/commands/make_language_redirects.py

@@ -65,7 +65,7 @@ def handle(self, *args, **options):
                 raise CommandError(f"No URLs found for site {site} in {from_name}")
 
             self.stdout.write(
-                "# Redirecting all translated {} URLs to the {} site\n".format(from_name, to_name)
+                f"# Redirecting all translated {from_name} URLs to the {to_name} site\n"
             )
             self.stdout.write("# Generated using {}".format(" ".join(sys.argv)))
 
@@ -92,7 +92,7 @@ def handle(self, *args, **options):
                     )
                 else:
                     self.stdout.write(
-                        "location {0} {{ return 301 {1}{2}; }}\n".format(from_rule, host, to_url)
+                        f"location {from_rule} {{ return 301 {host}{to_url}; }}\n"
                     )
 
             # Final redirect for all identical URLs

fluent_pages/models/db.py

@@ -572,7 +572,7 @@ def _update_cached_url(self, translation):
             if self.is_file:
                 translation._cached_url = f"{parent_url}{translation.slug}"
             else:
-                translation._cached_url = "{}{}/".format(parent_url, translation.slug)
+                translation._cached_url = f"{parent_url}{translation.slug}/"
 
     def _update_decendant_urls(self, translation):
         """
@@ -687,7 +687,7 @@ def _expire_url_caches(self):
         """
         cachekeys = [
             # created by urlresolvers._get_pages_of_type()
-            "fluent_pages.instance_of.{}.{}".format(self.__class__.__name__, self.parent_site_id)
+            f"fluent_pages.instance_of.{self.__class__.__name__}.{self.parent_site_id}"
         ]
         for cachekey in cachekeys:
             cache.delete(cachekey)

fluent_pages/models/managers.py

@@ -66,7 +66,7 @@ def get_for_path(self, path, language_code=None):
             return obj
         except self.model.DoesNotExist:
             raise self.model.DoesNotExist(
-                "No published {} found for the path '{}'".format(self.model.__name__, path)
+                f"No published {self.model.__name__} found for the path '{path}'"
             )
 
     def best_match_for_path(self, path, language_code=None):
@@ -100,7 +100,7 @@ def best_match_for_path(self, path, language_code=None):
             return obj
         except IndexError:
             raise self.model.DoesNotExist(
-                "No published {} found for the path '{}'".format(self.model.__name__, path)
+                f"No published {self.model.__name__} found for the path '{path}'"
             )
 
     def _split_path_levels(self, path):
@@ -138,7 +138,7 @@ def get_for_key(self, key):
                 )
             else:
                 raise self.model.DoesNotExist(
-                    "{} with key='{}' does not exist.".format(self.model.__name__, key)
+                    f"{self.model.__name__} with key='{key}' does not exist."
                 )
 
     def parent_site(self, site):

fluent_pages/models/navigation.py

@@ -155,7 +155,7 @@ def parent(self):
     def parent(self, new_parent):
         # Happens when django-mptt finds an object with a different level in the recursetree() / cache_tree_children() code.
         raise AttributeError(
-            "can't set attribute 'parent' of '{}' object.".format(self.__class__.__name__)
+            f"can't set attribute 'parent' of '{self.__class__.__name__}' object."
         )
 
     @property

fluent_pages/tests/utils.py

@@ -92,7 +92,7 @@ def assert404(self, url, msg_prefix=""):
             response.status_code,
             404,
             str(msg_prefix)
-            + "Page at {} should return 404, got {}.".format(url, response.status_code),
+            + f"Page at {url} should return 404, got {response.status_code}.",
         )
 
 

fluent_pages/urlresolvers.py

@@ -148,7 +148,7 @@ def _get_pages_of_type(model, language_code=None):
     if language_code is None:
         language_code = get_language()
 
-    cachekey = "fluent_pages.instance_of.{}.{}".format(model.__name__, settings.SITE_ID)
+    cachekey = f"fluent_pages.instance_of.{model.__name__}.{settings.SITE_ID}"
     pages = cache.get(cachekey)
     if not pages:
         pages = (

fluent_pages/views/dispatcher.py

@@ -286,7 +286,7 @@ def _call_url_view(self, plugin, sub_path, match):
         )
         if response is None:
             raise RuntimeError(
-                "The view '{}' didn't return an HttpResponse object.".format(match.url_name)
+                f"The view '{match.url_name}' didn't return an HttpResponse object."
             )
 
         return response