From eb5aef2554a6d2c566fe1aba72797e227c1bcc1d Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Sat, 8 Jun 2024 19:59:10 +0200 Subject: [PATCH] chore: migrate to f-string fix: use str() instead of f-string credit: tool pyupgrade Co-Authored-By: Alexandr Artemyev --- constance/admin.py | 4 ++-- constance/backends/database.py | 2 +- constance/backends/redisd.py | 2 +- constance/management/commands/constance.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/constance/admin.py b/constance/admin.py index 7109655..8d20604 100644 --- a/constance/admin.py +++ b/constance/admin.py @@ -199,11 +199,11 @@ class Config: @property def label(self): - return '%s.%s' % (self.app_label, self.object_name) + return f'{self.app_label}.{self.object_name}' @property def label_lower(self): - return '%s.%s' % (self.app_label, self.model_name) + return f'{self.app_label}.{self.model_name}' _meta = Meta() diff --git a/constance/backends/database.py b/constance/backends/database.py index 68c01e2..9d7b494 100644 --- a/constance/backends/database.py +++ b/constance/backends/database.py @@ -41,7 +41,7 @@ class DatabaseBackend(Backend): post_save.connect(self.clear, sender=self._model) def add_prefix(self, key): - return "%s%s" % (self._prefix, key) + return f"{self._prefix}{key}" def autofill(self): if not self._autofill_timeout or not self._cache: diff --git a/constance/backends/redisd.py b/constance/backends/redisd.py index 8f86a90..19948f9 100644 --- a/constance/backends/redisd.py +++ b/constance/backends/redisd.py @@ -28,7 +28,7 @@ class RedisBackend(Backend): self._rd = redis.Redis(**settings.REDIS_CONNECTION) def add_prefix(self, key): - return "%s%s" % (self._prefix, key) + return f"{self._prefix}{key}" def get(self, key): value = self._rd.get(self.add_prefix(key)) diff --git a/constance/management/commands/constance.py b/constance/management/commands/constance.py index c307887..cab7e92 100644 --- a/constance/management/commands/constance.py +++ b/constance/management/commands/constance.py @@ -60,7 +60,7 @@ class Command(BaseCommand): if command == 'get': try: - self.stdout.write("{}".format(getattr(config, key)), ending="\n") + self.stdout.write(str(getattr(config, key)), ending="\n") except AttributeError as e: raise CommandError(key + " is not defined in settings.CONSTANCE_CONFIG") @@ -78,7 +78,7 @@ class Command(BaseCommand): elif command == 'list': for k, v in get_values().items(): - self.stdout.write("{}\t{}".format(k, v), ending="\n") + self.stdout.write(f"{k}\t{v}", ending="\n") elif command == 'remove_stale_keys': @@ -91,6 +91,6 @@ class Command(BaseCommand): self.stdout.write("There are no stale records in database.", ending="\n") for stale_record in stale_records: - self.stdout.write("{}\t{}".format(stale_record.key, stale_record.value), ending="\n") + self.stdout.write(f"{stale_record.key}\t{stale_record.value}", ending="\n") stale_records.delete()