From c36bcb35bb985662211f7ecd91db3b79c43bb315 Mon Sep 17 00:00:00 2001 From: Aviv Eyal Date: Fri, 12 Apr 2019 17:04:46 -0700 Subject: [PATCH] black --- examples/starwars_newenum/schema.py | 2 ++ graphene/types/enum.py | 4 +++- graphene/types/tests/test_enum.py | 4 ++++ graphene/types/tests/test_resolver_enum_arg.py | 1 - graphene/types/tests/test_typemap.py | 5 ++++- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/examples/starwars_newenum/schema.py b/examples/starwars_newenum/schema.py index 972cffd9..6edb312b 100644 --- a/examples/starwars_newenum/schema.py +++ b/examples/starwars_newenum/schema.py @@ -10,8 +10,10 @@ class Episode(Enum): EMPIRE = 5 JEDI = 6 + GrapheneEpisode = graphene.Enum.from_enum(Episode, legacy_enum_resolver=False) + class Character(graphene.Interface): id = graphene.ID() name = graphene.String() diff --git a/graphene/types/enum.py b/graphene/types/enum.py index 261b0bfe..d31b534a 100644 --- a/graphene/types/enum.py +++ b/graphene/types/enum.py @@ -65,7 +65,9 @@ class EnumMeta(SubclassWithMeta_Meta): return cls.from_enum(PyEnum(*args, **kwargs), description=description) return super(EnumMeta, cls).__call__(*args, **kwargs) - def from_enum(cls, enum, description=None, deprecation_reason=None, legacy_enum_resolver=True): # noqa: N805 + def from_enum( + cls, enum, description=None, deprecation_reason=None, legacy_enum_resolver=True + ): # noqa: N805 description = description or enum.__doc__ meta_dict = { "enum": enum, diff --git a/graphene/types/tests/test_enum.py b/graphene/types/tests/test_enum.py index 599e162b..c11b2d6a 100644 --- a/graphene/types/tests/test_enum.py +++ b/graphene/types/tests/test_enum.py @@ -182,6 +182,7 @@ def test_enum_value_as_unmounted_argument(): assert isinstance(unmounted_field, Argument) assert unmounted_field.type == RGB + def test_legacy_enum_can_be_compared(): class RGB(Enum): RED = 1 @@ -192,11 +193,13 @@ def test_legacy_enum_can_be_compared(): assert RGB.GREEN == 2 assert RGB.BLUE == 3 + def test_new_enum_only_compare_to_enum_instances(): class RGBBase(PyEnum): RED = 1 GREEN = 2 BLUE = 3 + RGB = Enum.from_enum(RGBBase, legacy_enum_resolver=False) assert RGB.RED == RGBBase.RED @@ -206,6 +209,7 @@ def test_new_enum_only_compare_to_enum_instances(): assert RGB.GREEN != 2 assert RGB.BLUE != 3 + def test_enum_can_be_initialzied(): class RGB(Enum): RED = 1 diff --git a/graphene/types/tests/test_resolver_enum_arg.py b/graphene/types/tests/test_resolver_enum_arg.py index 7db9bd01..c2d8b596 100644 --- a/graphene/types/tests/test_resolver_enum_arg.py +++ b/graphene/types/tests/test_resolver_enum_arg.py @@ -43,7 +43,6 @@ def _call_and_get_arg(mocker, resolver_name, query): return resolver.call_args[1]["v"] - def test_resolve_enum_python(mocker): arg = _call_and_get_arg(mocker, "resolve_python", "{python(v:P2)}") assert arg is PythonBaseEnum.P2 diff --git a/graphene/types/tests/test_typemap.py b/graphene/types/tests/test_typemap.py index c6635a10..0d0e07ea 100644 --- a/graphene/types/tests/test_typemap.py +++ b/graphene/types/tests/test_typemap.py @@ -57,6 +57,7 @@ def test_enum_legacy(): GraphQLEnumValue(name="bar", value=2, description="Description bar=2"), ] + def test_enum_new(): class MyEnumBase(PyEnum): """Description""" @@ -89,7 +90,9 @@ def test_enum_new(): description="Description foo=1", deprecation_reason="Is deprecated", ), - GraphQLEnumValue(name="bar", value=MyEnumBase.bar, description="Description bar=2"), + GraphQLEnumValue( + name="bar", value=MyEnumBase.bar, description="Description bar=2" + ), ]