From 1a0fed01305ad279162c27983fd9a9723fdc8540 Mon Sep 17 00:00:00 2001 From: DoctorJohn Date: Sat, 6 Jun 2020 16:15:01 +0200 Subject: [PATCH] Apply changes suggested by the black formatter --- graphene_django/converter.py | 54 +++++++++++++++++++++++------- graphene_django/filter/utils.py | 4 ++- graphene_django/forms/converter.py | 16 ++++++--- 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/graphene_django/converter.py b/graphene_django/converter.py index 96d55cd..d8d37db 100644 --- a/graphene_django/converter.py +++ b/graphene_django/converter.py @@ -108,7 +108,9 @@ def convert_django_field_with_choices( if choices and convert_choices_to_enum: enum = convert_choice_field_to_enum(field) required = not (field.blank or field.null) - converted = enum(description=get_django_field_description(field), required=required) + converted = enum( + description=get_django_field_description(field), required=required + ) else: converted = convert_django_field(field, registry) if registry is not None: @@ -136,7 +138,9 @@ def convert_django_field(field, registry=None): @convert_django_field.register(models.FileField) @convert_django_field.register(models.FilePathField) def convert_field_to_string(field, registry=None): - return String(description=get_django_field_description(field), required=not field.null) + return String( + description=get_django_field_description(field), required=not field.null + ) @convert_django_field.register(models.AutoField) @@ -146,7 +150,9 @@ def convert_field_to_id(field, registry=None): @convert_django_field.register(models.UUIDField) def convert_field_to_uuid(field, registry=None): - return UUID(description=get_django_field_description(field), required=not field.null) + return UUID( + description=get_django_field_description(field), required=not field.null + ) @convert_django_field.register(models.PositiveIntegerField) @@ -161,29 +167,39 @@ def convert_field_to_int(field, registry=None): @convert_django_field.register(models.NullBooleanField) @convert_django_field.register(models.BooleanField) def convert_field_to_boolean(field, registry=None): - return Boolean(description=get_django_field_description(field), required=not field.null) + return Boolean( + description=get_django_field_description(field), required=not field.null + ) @convert_django_field.register(models.DecimalField) @convert_django_field.register(models.FloatField) @convert_django_field.register(models.DurationField) def convert_field_to_float(field, registry=None): - return Float(description=get_django_field_description(field), required=not field.null) + return Float( + description=get_django_field_description(field), required=not field.null + ) @convert_django_field.register(models.DateTimeField) def convert_datetime_to_string(field, registry=None): - return DateTime(description=get_django_field_description(field), required=not field.null) + return DateTime( + description=get_django_field_description(field), required=not field.null + ) @convert_django_field.register(models.DateField) def convert_date_to_string(field, registry=None): - return Date(description=get_django_field_description(field), required=not field.null) + return Date( + description=get_django_field_description(field), required=not field.null + ) @convert_django_field.register(models.TimeField) def convert_time_to_string(field, registry=None): - return Time(description=get_django_field_description(field), required=not field.null) + return Time( + description=get_django_field_description(field), required=not field.null + ) @convert_django_field.register(models.OneToOneRel) @@ -254,7 +270,11 @@ def convert_field_to_djangomodel(field, registry=None): if not _type: return - return Field(_type, description=get_django_field_description(field), required=not field.null) + return Field( + _type, + description=get_django_field_description(field), + required=not field.null, + ) return Dynamic(dynamic_type) @@ -264,13 +284,19 @@ def convert_postgres_array_to_list(field, registry=None): base_type = convert_django_field(field.base_field) if not isinstance(base_type, (List, NonNull)): base_type = type(base_type) - return List(base_type, description=get_django_field_description(field), required=not field.null) + return List( + base_type, + description=get_django_field_description(field), + required=not field.null, + ) @convert_django_field.register(HStoreField) @convert_django_field.register(JSONField) def convert_postgres_field_to_string(field, registry=None): - return JSONString(description=get_django_field_description(field), required=not field.null) + return JSONString( + description=get_django_field_description(field), required=not field.null + ) @convert_django_field.register(RangeField) @@ -278,7 +304,11 @@ def convert_postgres_range_to_string(field, registry=None): inner_type = convert_django_field(field.base_field) if not isinstance(inner_type, (List, NonNull)): inner_type = type(inner_type) - return List(inner_type, description=get_django_field_description(field), required=not field.null) + return List( + inner_type, + description=get_django_field_description(field), + required=not field.null, + ) # Register Django lazy()-wrapped values as GraphQL description/help_text. diff --git a/graphene_django/filter/utils.py b/graphene_django/filter/utils.py index 51111ef..426bae2 100644 --- a/graphene_django/filter/utils.py +++ b/graphene_django/filter/utils.py @@ -30,7 +30,9 @@ def get_filtering_args_from_filterset(filterset_class, type): form_field = filter_field.field field_type = convert_form_field(form_field).Argument() - field_type.description = None if filter_field.label is None else str(filter_field.label) + field_type.description = ( + None if filter_field.label is None else str(filter_field.label) + ) args[name] = field_type return args diff --git a/graphene_django/forms/converter.py b/graphene_django/forms/converter.py index 3a004dc..df3708f 100644 --- a/graphene_django/forms/converter.py +++ b/graphene_django/forms/converter.py @@ -29,7 +29,9 @@ def convert_form_field(field): @convert_form_field.register(forms.RegexField) @convert_form_field.register(forms.Field) def convert_form_field_to_string(field): - return String(description=get_form_field_description(field), required=field.required) + return String( + description=get_form_field_description(field), required=field.required + ) @convert_form_field.register(forms.UUIDField) @@ -45,7 +47,9 @@ def convert_form_field_to_int(field): @convert_form_field.register(forms.BooleanField) def convert_form_field_to_boolean(field): - return Boolean(description=get_form_field_description(field), required=field.required) + return Boolean( + description=get_form_field_description(field), required=field.required + ) @convert_form_field.register(forms.NullBooleanField) @@ -61,7 +65,9 @@ def convert_form_field_to_float(field): @convert_form_field.register(forms.MultipleChoiceField) def convert_form_field_to_string_list(field): - return List(String, description=get_form_field_description(field), required=field.required) + return List( + String, description=get_form_field_description(field), required=field.required + ) @convert_form_field.register(forms.ModelMultipleChoiceField) @@ -77,7 +83,9 @@ def convert_form_field_to_date(field): @convert_form_field.register(forms.DateTimeField) def convert_form_field_to_datetime(field): - return DateTime(description=get_form_field_description(field), required=field.required) + return DateTime( + description=get_form_field_description(field), required=field.required + ) @convert_form_field.register(forms.TimeField)