Update code to Python3.6 style by applying pyupgrade.

Author: hramezani

docs/conf.py

@@ -26,8 +26,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'pytest-django'
-copyright = u'%d, Andreas Pelme and contributors' % datetime.date.today().year
+project = 'pytest-django'
+copyright = '%d, Andreas Pelme and contributors' % datetime.date.today().year
 
 exclude_patterns = ['_build']
 

pytest_django/fixtures.py

@@ -293,7 +293,7 @@ def _set_suffix_to_test_databases(suffix: str) -> None:
             continue
 
         db_settings.setdefault("TEST", {})
-        db_settings["TEST"]["NAME"] = "{}_{}".format(test_name, suffix)
+        db_settings["TEST"]["NAME"] = f"{test_name}_{suffix}"
 
 
 # ############### User visible fixtures ################
@@ -595,11 +595,11 @@ def _assert_num_queries(
                 num,
                 "" if exact else "or less ",
                 "but {} done".format(
-                    num_performed == 1 and "1 was" or "{} were".format(num_performed)
+                    num_performed == 1 and "1 was" or f"{num_performed} were"
                 ),
             )
             if info:
-                msg += "\n{}".format(info)
+                msg += f"\n{info}"
             if verbose:
                 sqls = (q["sql"] for q in context.captured_queries)
                 msg += "\n\nQueries:\n========\n\n" + "\n\n".join(sqls)

pytest_django/live_server_helper.py

@@ -69,13 +69,13 @@ def stop(self) -> None:
 
     @property
     def url(self) -> str:
-        return "http://{}:{}".format(self.thread.host, self.thread.port)
+        return f"http://{self.thread.host}:{self.thread.port}"
 
     def __str__(self) -> str:
         return self.url
 
     def __add__(self, other) -> str:
-        return "{}{}".format(self, other)
+        return f"{self}{other}"
 
     def __repr__(self) -> str:
         return "<LiveServer listening at %s>" % self.url

pytest_django/plugin.py

@@ -331,11 +331,11 @@ def _get_option_with_source(
     dc, dc_source = _get_option_with_source(options.dc, CONFIGURATION_ENV)
 
     if ds:
-        _report_header.append("settings: {} (from {})".format(ds, ds_source))
+        _report_header.append(f"settings: {ds} (from {ds_source})")
         os.environ[SETTINGS_MODULE_ENV] = ds
 
         if dc:
-            _report_header.append("configuration: {} (from {})".format(dc, dc_source))
+            _report_header.append(f"configuration: {dc} (from {dc_source})")
             os.environ[CONFIGURATION_ENV] = dc
 
             # Install the django-configurations importer
@@ -619,7 +619,7 @@ def _get_origin():
         def __mod__(self, var: str) -> str:
             origin = self._get_origin()
             if origin:
-                msg = "Undefined template variable '{}' in '{}'".format(var, origin)
+                msg = f"Undefined template variable '{var}' in '{origin}'"
             else:
                 msg = "Undefined template variable '%s'" % var
             if self.fail:

pytest_django_test/db_helpers.py

@@ -22,10 +22,10 @@
 
     if TEST_DB_NAME is None:
         # No explicit test db name was given, construct a default one
-        TEST_DB_NAME = "test_{}_inner".format(DB_NAME)
+        TEST_DB_NAME = f"test_{DB_NAME}_inner"
     else:
         # An explicit test db name was given, is that as the base name
-        TEST_DB_NAME = "{}_inner".format(TEST_DB_NAME)
+        TEST_DB_NAME = f"{TEST_DB_NAME}_inner"
 
     SECOND_DB_NAME = DB_NAME + '_second' if DB_NAME is not None else None
     SECOND_TEST_DB_NAME = TEST_DB_NAME + '_second' if DB_NAME is not None else None
@@ -93,7 +93,7 @@ def skip_if_sqlite_in_memory():
 def _get_db_name(db_suffix=None):
     name = TEST_DB_NAME
     if db_suffix:
-        name = "{}_{}".format(name, db_suffix)
+        name = f"{name}_{db_suffix}"
     return name
 
 

tests/test_fixtures.py

@@ -414,7 +414,7 @@ def test_settings_before(self) -> None:
         from django.conf import settings
 
         assert (
-            "{}.{}".format(settings.__class__.__module__, settings.__class__.__name__)
+            f"{settings.__class__.__module__}.{settings.__class__.__name__}"
             == "django.conf.Settings"
         )
         TestLiveServer._test_settings_before_run = True  # type: ignore[attr-defined]
@@ -431,7 +431,7 @@ def test_settings_restored(self) -> None:
 
         assert TestLiveServer._test_settings_before_run is True  # type: ignore[attr-defined]
         assert (
-            "{}.{}".format(settings.__class__.__module__, settings.__class__.__name__)
+            f"{settings.__class__.__module__}.{settings.__class__.__name__}"
             == "django.conf.Settings"
         )
         assert settings.ALLOWED_HOSTS == ["testserver"]