graphql-python/graphene
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene.git synced 2025-09-21 11:22:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove six simple usages

Browse Source
This commit is contained in:
Eran Kampf 2019-06-01 18:50:07 -07:00
parent db6ed96ef6
commit b4d4f60534
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphene/test/__init__.py
View File

@ -1,5 +1,4 @@
from promise import Promise, is_thenable from promise import Promise, is_thenable
import six
from graphql.error import format_error as format_graphql_error from graphql.error import format_error as format_graphql_error
from graphql.error import GraphQLError from graphql.error import GraphQLError
@ -10,7 +9,7 @@ def default_format_error(error):
if isinstance(error, GraphQLError): if isinstance(error, GraphQLError):
return format_graphql_error(error) return format_graphql_error(error)
return {"message": six.text_type(error)} return {"message": str(error)}
def format_execution_result(execution_result, format_error): def format_execution_result(execution_result, format_error):

7
graphene/types/datetime.py
View File

@ -4,7 +4,6 @@ import datetime
from aniso8601 import parse_date, parse_datetime, parse_time from aniso8601 import parse_date, parse_datetime, parse_time
from graphql.language import ast from graphql.language import ast
from six import string_types
from .scalars import Scalar from .scalars import Scalar
@ -35,7 +34,7 @@ class Date(Scalar):
try: try:
if isinstance(value, datetime.date): if isinstance(value, datetime.date):
return value return value
elif isinstance(value, string_types): elif isinstance(value, str):
return parse_date(value) return parse_date(value)
except ValueError: except ValueError:
return None return None
@ -65,7 +64,7 @@ class DateTime(Scalar):
try: try:
if isinstance(value, datetime.datetime): if isinstance(value, datetime.datetime):
return value return value
elif isinstance(value, string_types): elif isinstance(value, str):
return parse_datetime(value) return parse_datetime(value)
except ValueError: except ValueError:
return None return None
@ -95,7 +94,7 @@ class Time(Scalar):
try: try:
if isinstance(value, datetime.time): if isinstance(value, datetime.time):
return value return value
elif isinstance(value, string_types): elif isinstance(value, str):
return parse_time(value) return parse_time(value)
except ValueError: except ValueError:
return None return None

3
graphene/types/scalars.py
View File

@ -1,4 +1,3 @@
import six
from typing import Any from typing import Any
from graphql.language.ast import BooleanValue, FloatValue, IntValue, StringValue from graphql.language.ast import BooleanValue, FloatValue, IntValue, StringValue
@ -113,7 +112,7 @@ class String(Scalar):
def coerce_string(value): def coerce_string(value):
if isinstance(value, bool): if isinstance(value, bool):
return u"true" if value else u"false" return u"true" if value else u"false"
return six.text_type(value) return str(value)
serialize = coerce_string serialize = coerce_string
parse_value = coerce_string parse_value = coerce_string

4
graphene/types/utils.py
View File

@ -2,8 +2,6 @@ import inspect
from collections import OrderedDict from collections import OrderedDict
from functools import partial from functools import partial
from six import string_types
from ..utils.module_loading import import_string from ..utils.module_loading import import_string
from .mountedtype import MountedType from .mountedtype import MountedType
from .unmountedtype import UnmountedType from .unmountedtype import UnmountedType
@ -39,7 +37,7 @@ def yank_fields_from_attrs(attrs, _as=None, sort=True):
def get_type(_type): def get_type(_type):
if isinstance(_type, string_types): if isinstance(_type, str):
return import_string(_type) return import_string(_type)
if inspect.isfunction(_type) or isinstance(_type, partial): if inspect.isfunction(_type) or isinstance(_type, partial):
return _type() return _type()

3
graphene/types/uuid.py
View File

@ -1,5 +1,4 @@
from __future__ import absolute_import from __future__ import absolute_import
import six
from uuid import UUID as _UUID from uuid import UUID as _UUID
from graphql.language import ast from graphql.language import ast
@ -12,7 +11,7 @@ class UUID(Scalar):
@staticmethod @staticmethod
def serialize(uuid): def serialize(uuid):
if isinstance(uuid, six.string_types): if isinstance(uuid, str):
uuid = _UUID(uuid) uuid = _UUID(uuid)
assert isinstance(uuid, _UUID), "Expected UUID instance, received {}".format( assert isinstance(uuid, _UUID), "Expected UUID instance, received {}".format(