diff --git a/graphene/types/datetime.py b/graphene/types/datetime.py index ca96547f..fecdd88a 100644 --- a/graphene/types/datetime.py +++ b/graphene/types/datetime.py @@ -3,7 +3,7 @@ from __future__ import absolute_import import datetime from aniso8601 import parse_date, parse_datetime, parse_time -from graphql.language import ast +from graphql.language.ast import StringValueNode from .scalars import Scalar @@ -26,7 +26,7 @@ class Date(Scalar): @classmethod def parse_literal(cls, node): - if isinstance(node, ast.StringValue): + if isinstance(node, StringValueNode): return cls.parse_value(node.value) @staticmethod @@ -56,7 +56,7 @@ class DateTime(Scalar): @classmethod def parse_literal(cls, node): - if isinstance(node, ast.StringValue): + if isinstance(node, StringValueNode): return cls.parse_value(node.value) @staticmethod @@ -86,7 +86,7 @@ class Time(Scalar): @classmethod def parse_literal(cls, node): - if isinstance(node, ast.StringValue): + if isinstance(node, StringValueNode): return cls.parse_value(node.value) @classmethod diff --git a/graphene/types/decimal.py b/graphene/types/decimal.py index 2f99134d..10a2609a 100644 --- a/graphene/types/decimal.py +++ b/graphene/types/decimal.py @@ -2,7 +2,7 @@ from __future__ import absolute_import from decimal import Decimal as _Decimal -from graphql.language import ast +from graphql.language.ast import StringValueNode from .scalars import Scalar @@ -23,7 +23,7 @@ class Decimal(Scalar): @classmethod def parse_literal(cls, node): - if isinstance(node, ast.StringValue): + if isinstance(node, StringValueNode): return cls.parse_value(node.value) @staticmethod diff --git a/graphene/types/generic.py b/graphene/types/generic.py index e5470dd9..5d1a6c4b 100644 --- a/graphene/types/generic.py +++ b/graphene/types/generic.py @@ -1,12 +1,12 @@ from __future__ import unicode_literals from graphql.language.ast import ( - BooleanValue, - FloatValue, - IntValue, - ListValue, - ObjectValue, - StringValue, + BooleanValueNode, + FloatValueNode, + IntValueNode, + ListValueNode, + ObjectValueNode, + StringValueNode, ) from graphene.types.scalars import MAX_INT, MIN_INT @@ -30,17 +30,17 @@ class GenericScalar(Scalar): @staticmethod def parse_literal(ast): - if isinstance(ast, (StringValue, BooleanValue)): + if isinstance(ast, (StringValueNode, BooleanValueNode)): return ast.value - elif isinstance(ast, IntValue): + elif isinstance(ast, IntValueNode): num = int(ast.value) if MIN_INT <= num <= MAX_INT: return num - elif isinstance(ast, FloatValue): + elif isinstance(ast, FloatValueNode): return float(ast.value) - elif isinstance(ast, ListValue): + elif isinstance(ast, ListValueNode): return [GenericScalar.parse_literal(value) for value in ast.values] - elif isinstance(ast, ObjectValue): + elif isinstance(ast, ObjectValueNode): return { field.name.value: GenericScalar.parse_literal(field.value) for field in ast.fields diff --git a/graphene/types/json.py b/graphene/types/json.py index 495943a9..f21f92ce 100644 --- a/graphene/types/json.py +++ b/graphene/types/json.py @@ -2,7 +2,7 @@ from __future__ import absolute_import import json -from graphql.language import ast +from graphql.language.ast import StringValueNode from .scalars import Scalar @@ -16,7 +16,7 @@ class JSONString(Scalar): @staticmethod def parse_literal(node): - if isinstance(node, ast.StringValue): + if isinstance(node, StringValueNode): return json.loads(node.value) @staticmethod diff --git a/graphene/types/scalars.py b/graphene/types/scalars.py index b9cb1aa0..245fa570 100644 --- a/graphene/types/scalars.py +++ b/graphene/types/scalars.py @@ -1,6 +1,11 @@ from typing import Any -from graphql.language.ast import BooleanValue, FloatValue, IntValue, StringValue +from graphql.language.ast import ( + BooleanValueNode, + FloatValueNode, + IntValueNode, + StringValueNode, +) from .base import BaseOptions, BaseType from .unmountedtype import UnmountedType @@ -71,7 +76,7 @@ class Int(Scalar): @staticmethod def parse_literal(ast): - if isinstance(ast, IntValue): + if isinstance(ast, IntValueNode): num = int(ast.value) if MIN_INT <= num <= MAX_INT: return num @@ -97,7 +102,7 @@ class Float(Scalar): @staticmethod def parse_literal(ast): - if isinstance(ast, (FloatValue, IntValue)): + if isinstance(ast, (FloatValueNode, IntValueNode)): return float(ast.value) @@ -119,7 +124,7 @@ class String(Scalar): @staticmethod def parse_literal(ast): - if isinstance(ast, StringValue): + if isinstance(ast, StringValueNode): return ast.value @@ -133,7 +138,7 @@ class Boolean(Scalar): @staticmethod def parse_literal(ast): - if isinstance(ast, BooleanValue): + if isinstance(ast, BooleanValueNode): return ast.value @@ -151,5 +156,5 @@ class ID(Scalar): @staticmethod def parse_literal(ast): - if isinstance(ast, (StringValue, IntValue)): + if isinstance(ast, (StringValueNode, IntValueNode)): return ast.value diff --git a/graphene/types/uuid.py b/graphene/types/uuid.py index f55e7a85..c31b0a8c 100644 --- a/graphene/types/uuid.py +++ b/graphene/types/uuid.py @@ -1,7 +1,7 @@ from __future__ import absolute_import from uuid import UUID as _UUID -from graphql.language import ast +from graphql.language.ast import StringValueNode from .scalars import Scalar @@ -21,7 +21,7 @@ class UUID(Scalar): @staticmethod def parse_literal(node): - if isinstance(node, ast.StringValue): + if isinstance(node, StringValueNode): return _UUID(node.value) @staticmethod