Merge 899deaa into 6e2bb3b

graphene/pyutils/compat.py

@@ -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__

graphene/test/__init__.py

@@ -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
 
@@ -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):

graphene/types/datetime.py

@@ -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
 
@@ -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
@@ -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
@@ -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

graphene/types/enum.py

@@ -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
@@ -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:

graphene/types/scalars.py

@@ -1,4 +1,3 @@
-import six
 from typing import Any
 
 from graphql.language.ast import BooleanValue, FloatValue, IntValue, StringValue
@@ -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

graphene/types/utils.py

@@ -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
@@ -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()

graphene/types/uuid.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-import six
 from uuid import UUID as _UUID
 
 from graphql.language import ast
@@ -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(

graphene/utils/subclass_with_meta.py

@@ -1,7 +1,5 @@
 from inspect import isclass
 
-import six
-
 from ..pyutils.init_subclass import InitSubclassMeta
 from .props import props
 
@@ -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

setup.py

@@ -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.*",