Skip to content

Remove six dependency #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions graphene/pyutils/compat.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
from __future__ import absolute_import

import six

from graphql.pyutils.compat import Enum

try:
from inspect import signature
except ImportError:
from .signature import signature

if six.PY2:

def func_name(func):
return func.func_name


else:

def func_name(func):
return func.__name__
3 changes: 1 addition & 2 deletions graphene/test/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from promise import Promise, is_thenable
import six
from graphql.error import format_error as format_graphql_error
from graphql.error import GraphQLError

Expand All @@ -10,7 +9,7 @@ def default_format_error(error):
if isinstance(error, GraphQLError):
return format_graphql_error(error)

return {"message": six.text_type(error)}
return {"message": str(error)}


def format_execution_result(execution_result, format_error):
Expand Down
7 changes: 3 additions & 4 deletions graphene/types/datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

from aniso8601 import parse_date, parse_datetime, parse_time
from graphql.language import ast
from six import string_types

from .scalars import Scalar

Expand Down Expand Up @@ -35,7 +34,7 @@ def parse_value(value):
try:
if isinstance(value, datetime.date):
return value
elif isinstance(value, string_types):
elif isinstance(value, str):
return parse_date(value)
except ValueError:
return None
Expand Down Expand Up @@ -65,7 +64,7 @@ def parse_value(value):
try:
if isinstance(value, datetime.datetime):
return value
elif isinstance(value, string_types):
elif isinstance(value, str):
return parse_datetime(value)
except ValueError:
return None
Expand Down Expand Up @@ -95,7 +94,7 @@ def parse_value(cls, value):
try:
if isinstance(value, datetime.time):
return value
elif isinstance(value, string_types):
elif isinstance(value, str):
return parse_time(value)
except ValueError:
return None
5 changes: 1 addition & 4 deletions graphene/types/enum.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
from collections import OrderedDict

import six

from graphene.utils.subclass_with_meta import SubclassWithMeta_Meta

from ..pyutils.compat import Enum as PyEnum
Expand Down Expand Up @@ -66,7 +63,7 @@ def from_enum(cls, enum, description=None, deprecation_reason=None): # noqa: N8
return type(meta_class.enum.__name__, (Enum,), {"Meta": meta_class})


class Enum(six.with_metaclass(EnumMeta, UnmountedType, BaseType)):
class Enum(UnmountedType, BaseType, metaclass=EnumMeta):
@classmethod
def __init_subclass_with_meta__(cls, enum=None, _meta=None, **options):
if not _meta:
Expand Down
3 changes: 1 addition & 2 deletions graphene/types/scalars.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import six
from typing import Any

from graphql.language.ast import BooleanValue, FloatValue, IntValue, StringValue
Expand Down Expand Up @@ -113,7 +112,7 @@ class String(Scalar):
def coerce_string(value):
if isinstance(value, bool):
return u"true" if value else u"false"
return six.text_type(value)
return str(value)

serialize = coerce_string
parse_value = coerce_string
Expand Down
4 changes: 1 addition & 3 deletions graphene/types/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
from collections import OrderedDict
from functools import partial

from six import string_types

from ..utils.module_loading import import_string
from .mountedtype import MountedType
from .unmountedtype import UnmountedType
Expand Down Expand Up @@ -39,7 +37,7 @@ def yank_fields_from_attrs(attrs, _as=None, sort=True):


def get_type(_type):
if isinstance(_type, string_types):
if isinstance(_type, str):
return import_string(_type)
if inspect.isfunction(_type) or isinstance(_type, partial):
return _type()
Expand Down
3 changes: 1 addition & 2 deletions graphene/types/uuid.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from __future__ import absolute_import
import six
from uuid import UUID as _UUID

from graphql.language import ast
Expand All @@ -12,7 +11,7 @@ class UUID(Scalar):

@staticmethod
def serialize(uuid):
if isinstance(uuid, six.string_types):
if isinstance(uuid, str):
uuid = _UUID(uuid)

assert isinstance(uuid, _UUID), "Expected UUID instance, received {}".format(
Expand Down
4 changes: 1 addition & 3 deletions graphene/utils/subclass_with_meta.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
from inspect import isclass

import six

from ..pyutils.init_subclass import InitSubclassMeta
from .props import props

Expand All @@ -18,7 +16,7 @@ def __repr__(cls):
return "<{} meta={}>".format(cls.__name__, repr(cls._meta))


class SubclassWithMeta(six.with_metaclass(SubclassWithMeta_Meta)):
class SubclassWithMeta(metaclass=SubclassWithMeta_Meta):
"""This class improves __init_subclass__ to receive automatically the options from meta"""

# We will only have the metaclass in Python 2
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ def run_tests(self):
keywords="api graphql protocol rest relay graphene",
packages=find_packages(exclude=["tests", "tests.*", "examples"]),
install_requires=[
"six>=1.10.0,<2",
"graphql-core>=2.1,<3",
"graphql-relay>=0.4.5,<1",
"aniso8601>=3,<=6.0.*",
Expand Down