Skip to content

Commit

Permalink
Apply changes suggested by the black formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
DoctorJohn committed Jun 6, 2020
1 parent b725976 commit 1a0fed0
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 17 deletions.
54 changes: 42 additions & 12 deletions graphene_django/converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -254,7 +270,11 @@ def dynamic_type():
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)

Expand All @@ -264,21 +284,31 @@ 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)
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.
Expand Down
4 changes: 3 additions & 1 deletion graphene_django/filter/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 12 additions & 4 deletions graphene_django/forms/converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit 1a0fed0

Please sign in to comment.