From 67ed8bc71eac43cf8c08ceb1bf355ecf534ea47f Mon Sep 17 00:00:00 2001 From: Takayuki SHIMIZUKAWA Date: Sat, 23 Nov 2024 07:31:13 +0000 Subject: [PATCH] [#142] upgrade old syntax --- django_redshift_backend/base.py | 14 ++++++-------- django_redshift_backend/meta.py | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/django_redshift_backend/base.py b/django_redshift_backend/base.py index 096484f..8890e1a 100644 --- a/django_redshift_backend/base.py +++ b/django_redshift_backend/base.py @@ -4,8 +4,6 @@ Requires psycopg 2: http://initd.org/projects/psycopg2 """ -from __future__ import absolute_import - from copy import deepcopy import re import uuid @@ -121,7 +119,7 @@ def sequence_reset_sql(self, style, model_list): return [] def get_db_converters(self, expression): - converters = super(DatabaseOperations, self).get_db_converters(expression) + converters = super().get_db_converters(expression) internal_type = expression.output_field.get_internal_type() if internal_type == "UUIDField": converters.append(self.convert_uuidfield_value) @@ -139,7 +137,7 @@ def distinct_sql(self, fields, *args): raise NotSupportedError( "DISTINCT ON fields is not supported by this database backend" ) - return super(DatabaseOperations, self).distinct_sql(fields, *args) + return super().distinct_sql(fields, *args) def adapt_integerfield_value(self, value, internal_type): return value @@ -278,7 +276,7 @@ def create_model(self, model): if m: definition = re.sub( r"varchar\((\d+?)\)", - "varchar({0})".format( + "varchar({})".format( str(int(m.group(1)) * self.multiply_varchar_length) ), definition, @@ -1058,7 +1056,7 @@ def quoted_column_name(field_name): if isinstance(idx, DistKey): if distkey: raise ValueError( - "Model {} has more than one DistKey.".format(model.__name__) + f"Model {model.__name__} has more than one DistKey." ) distkey = idx if distkey: @@ -1072,7 +1070,7 @@ def quoted_column_name(field_name): ) ) normalized_field = quoted_column_name(distkey.fields[0]) - create_options.append("DISTKEY({})".format(normalized_field)) + create_options.append(f"DISTKEY({normalized_field})") # TODO: Support DISTSTYLE ALL. sortkeys = [ @@ -1368,7 +1366,7 @@ class DatabaseWrapper(BasePGDatabaseWrapper): data_types.update(redshift_data_types) def __init__(self, *args, **kwargs): - super(DatabaseWrapper, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.atomic_blocks = [] self.features = DatabaseFeatures(self) diff --git a/django_redshift_backend/meta.py b/django_redshift_backend/meta.py index 9387951..b18d9c4 100644 --- a/django_redshift_backend/meta.py +++ b/django_redshift_backend/meta.py @@ -37,7 +37,7 @@ def __hash__(self): return hash(str(self)) def deconstruct(self): - path = "%s.%s" % (self.__class__.__module__, self.__class__.__name__) + path = "{}.{}".format(self.__class__.__module__, self.__class__.__name__) path = path.replace("django_redshift_backend.meta", "django_redshift_backend") return (path, [str(self)], {})