diff --git a/graphene/types/definitions.py b/graphene/types/definitions.py index 60971ad8..992bb43a 100644 --- a/graphene/types/definitions.py +++ b/graphene/types/definitions.py @@ -61,26 +61,8 @@ class ClassTypeMeta(type): class GrapheneGraphQLType(object): def __init__(self, *args, **kwargs): self.graphene_type = kwargs.pop('graphene_type') - self._name = None - self._description = None super(GrapheneGraphQLType, self).__init__(*args, **kwargs) - @property - def name(self): - return self._name or self.graphene_type.__name__ - - @name.setter - def name(self, name): - self._name = name - - @property - def description(self): - return self._description or self.graphene_type.__doc__ - - @description.setter - def description(self, description): - self._description = description - class GrapheneFieldsType(GrapheneGraphQLType): def __init__(self, *args, **kwargs): diff --git a/graphene/types/enum.py b/graphene/types/enum.py index c6c2492a..69eb197f 100644 --- a/graphene/types/enum.py +++ b/graphene/types/enum.py @@ -15,8 +15,8 @@ class GrapheneEnumType(GrapheneGraphQLType, GraphQLEnumType): def __init__(self, *args, **kwargs): graphene_type = kwargs.pop('graphene_type') self.graphene_type = graphene_type - self._name = None - self._description = None + self.name = None + self.description = None self._values = None self._value_lookup = None self._name_lookup = None @@ -47,7 +47,7 @@ class EnumTypeMeta(ClassTypeMeta): cls._meta.graphql_type = GrapheneEnumType( graphene_type=cls, name=cls._meta.name or cls.__name__, - description=cls._meta.description, + description=cls._meta.description or cls.__doc__, ) def construct(cls, bases, attrs): diff --git a/graphene/types/inputobjecttype.py b/graphene/types/inputobjecttype.py index b319ce28..2fe41e7d 100644 --- a/graphene/types/inputobjecttype.py +++ b/graphene/types/inputobjecttype.py @@ -33,7 +33,7 @@ class InputObjectTypeMeta(ClassTypeMeta): cls._meta.graphql_type = GrapheneInputObjectType( graphene_type=cls, name=cls._meta.name or cls.__name__, - description=cls._meta.description, + description=cls._meta.description or cls.__doc__, fields=FieldMap(cls, bases=filter(None, inherited_types)), ) diff --git a/graphene/types/interface.py b/graphene/types/interface.py index 491fa31f..9462db30 100644 --- a/graphene/types/interface.py +++ b/graphene/types/interface.py @@ -29,7 +29,7 @@ class InterfaceTypeMeta(ClassTypeMeta): cls._meta.graphql_type = GrapheneInterfaceType( graphene_type=cls, name=cls._meta.name or cls.__name__, - description=cls._meta.description, + description=cls._meta.description or cls.__doc__, fields=FieldMap(cls, bases=filter(None, inherited_types)), ) diff --git a/graphene/types/objecttype.py b/graphene/types/objecttype.py index 217ec092..5cdfa761 100644 --- a/graphene/types/objecttype.py +++ b/graphene/types/objecttype.py @@ -68,7 +68,7 @@ class ObjectTypeMeta(ClassTypeMeta): cls._meta.graphql_type = GrapheneObjectType( graphene_type=cls, name=cls._meta.name or cls.__name__, - description=cls._meta.description, + description=cls._meta.description or cls.__doc__, fields=FieldMap(cls, bases=filter(None, inherited_types)), interfaces=tuple(cls.get_interfaces()), ) diff --git a/graphene/types/scalars.py b/graphene/types/scalars.py index 61332832..e023fe89 100644 --- a/graphene/types/scalars.py +++ b/graphene/types/scalars.py @@ -29,7 +29,7 @@ class ScalarTypeMeta(ClassTypeMeta): cls._meta.graphql_type = GrapheneScalarType( graphene_type=cls, name=cls._meta.name or cls.__name__, - description=cls._meta.description, + description=cls._meta.description or cls.__doc__, serialize=getattr(cls, 'serialize', None), parse_value=getattr(cls, 'parse_value', None),