From 98b8025ed7af1dd1d5adf6b6d0fceb51f219c67b Mon Sep 17 00:00:00 2001 From: Fabio Caccamo Date: Tue, 6 Dec 2022 13:44:32 +0100 Subject: [PATCH] Replace `str.format` with `f-strings`. --- .../templatetags/admin_interface_tags.py | 4 +--- setup.py | 18 +++++++++++------- tests/test_models.py | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/admin_interface/templatetags/admin_interface_tags.py b/admin_interface/templatetags/admin_interface_tags.py index 5178346..87e71ce 100644 --- a/admin_interface/templatetags/admin_interface_tags.py +++ b/admin_interface/templatetags/admin_interface_tags.py @@ -49,9 +49,7 @@ def get_admin_interface_languages(context): "name": lang_name, "default": lang_code == default_lang_code, "active": lang_code == current_lang_code, - "activation_url": "{}?next=/{}{}".format( - set_language_url, lang_code, admin_nolang_url - ), + "activation_url": f"{set_language_url}?next=/{lang_code}{admin_nolang_url}", } langs_data.append(lang_data) return langs_data diff --git a/setup.py b/setup.py index 231d158..738a6a2 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python + import os import sys @@ -6,12 +7,15 @@ from setuptools import find_packages, setup exec(open("admin_interface/version.py").read()) -github_url = "https://github.com/fabiocaccamo" +package_name = "django-admin-interface" +package_url = f"https://github.com/fabiocaccamo/{package_name}" +package_path = os.path.abspath(os.path.dirname(__file__)) +download_url = f"{package_url}/archive/{__version__}.tar.gz" +documentation_url = f"{package_url}#readme" +issues_url = f"{package_url}/issues" sponsor_url = "https://github.com/sponsors/fabiocaccamo/" twitter_url = "https://twitter.com/fabiocaccamo" -package_name = "django-admin-interface" -package_url = "{}/{}".format(github_url, package_name) -package_path = os.path.abspath(os.path.dirname(__file__)) + long_description_file_path = os.path.join(package_path, "README.md") long_description_content_type = "text/markdown" long_description = "" @@ -32,10 +36,10 @@ setup( author="Fabio Caccamo", author_email="fabio.caccamo@gmail.com", url=package_url, - download_url="{}/archive/{}.tar.gz".format(package_url, __version__), + download_url=download_url, project_urls={ - "Documentation": "{}#readme".format(package_url), - "Issues": "{}/issues".format(package_url), + "Documentation": documentation_url, + "Issues": issues_url, "Funding": sponsor_url, "Twitter": twitter_url, }, diff --git a/tests/test_models.py b/tests/test_models.py index 60d5560..de12268 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -89,7 +89,7 @@ class AdminInterfaceModelsTestCase(TestCase): def test_str(self): theme = Theme.get_active_theme() - self.assertEqual("{0}".format(theme), "Django") + self.assertEqual(f"{theme}", "Django") # class AdminInterfaceModelsMultiDBTestCase(TestCase):