diff --git a/graphene_django/debug/sql/tracking.py b/graphene_django/debug/sql/tracking.py index 95a00b6..050e6dc 100644 --- a/graphene_django/debug/sql/tracking.py +++ b/graphene_django/debug/sql/tracking.py @@ -5,7 +5,6 @@ import json from threading import local from time import time -import six from django.utils.encoding import force_str from .types import DjangoDebugSQL @@ -77,7 +76,7 @@ class NormalCursorWrapper: self.logger = logger def _quote_expr(self, element): - if isinstance(element, six.string_types): + if isinstance(element, str): return "'%s'" % force_str(element).replace("'", "''") else: return repr(element) diff --git a/graphene_django/fields.py b/graphene_django/fields.py index fdf95aa..1782ea4 100644 --- a/graphene_django/fields.py +++ b/graphene_django/fields.py @@ -1,6 +1,5 @@ from functools import partial -import six from django.db.models.query import QuerySet from graphql_relay.connection.arrayconnection import ( connection_from_list_slice, diff --git a/graphene_django/filter/utils.py b/graphene_django/filter/utils.py index c7aa959..51fb7be 100644 --- a/graphene_django/filter/utils.py +++ b/graphene_django/filter/utils.py @@ -1,5 +1,3 @@ -import six - import graphene from django import forms diff --git a/graphene_django/settings.py b/graphene_django/settings.py index 9295341..a824466 100644 --- a/graphene_django/settings.py +++ b/graphene_django/settings.py @@ -13,7 +13,6 @@ back to the defaults. """ from __future__ import unicode_literals -import six from django.conf import settings from django.test.signals import setting_changed @@ -62,7 +61,7 @@ def perform_import(val, setting_name): """ if val is None: return None - elif isinstance(val, six.string_types): + elif isinstance(val, str): return import_from_string(val, setting_name) elif isinstance(val, (list, tuple)): return [import_from_string(item, setting_name) for item in val] diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py index 297e461..7af79f8 100644 --- a/graphene_django/tests/test_command.py +++ b/graphene_django/tests/test_command.py @@ -2,7 +2,7 @@ from textwrap import dedent from django.core import management from mock import mock_open, patch -from six import StringIO +from io import StringIO from graphene import ObjectType, Schema, String diff --git a/graphene_django/types.py b/graphene_django/types.py index e38ae1f..1220f05 100644 --- a/graphene_django/types.py +++ b/graphene_django/types.py @@ -1,7 +1,6 @@ import warnings from collections import OrderedDict -import six from django.db.models import Model from django.utils.functional import SimpleLazyObject @@ -21,8 +20,7 @@ from .utils import ( is_valid_django_model, ) -if six.PY3: - from typing import Type +from typing import Type ALL_FIELDS = "__all__" diff --git a/graphene_django/utils/utils.py b/graphene_django/utils/utils.py index ff3b7f3..fb416de 100644 --- a/graphene_django/utils/utils.py +++ b/graphene_django/utils/utils.py @@ -1,6 +1,5 @@ import inspect -import six from django.db import connection, models, transaction from django.db.models.manager import Manager from django.utils.encoding import force_str @@ -27,13 +26,13 @@ def isiterable(value): def _camelize_django_str(s): if isinstance(s, Promise): s = force_str(s) - return to_camel_case(s) if isinstance(s, six.string_types) else s + return to_camel_case(s) if isinstance(s, str) else s def camelize(data): if isinstance(data, dict): return {_camelize_django_str(k): camelize(v) for k, v in data.items()} - if isiterable(data) and not isinstance(data, (six.string_types, Promise)): + if isiterable(data) and not isinstance(data, ((str,), Promise)): return [camelize(d) for d in data] return data diff --git a/graphene_django/views.py b/graphene_django/views.py index 9908e70..b7f6a94 100644 --- a/graphene_django/views.py +++ b/graphene_django/views.py @@ -2,7 +2,6 @@ import inspect import json import re -import six from django.db import connection, transaction from django.http import HttpResponse, HttpResponseNotAllowed from django.http.response import HttpResponseBadRequest @@ -374,7 +373,7 @@ class GraphQLView(View): variables = request.GET.get("variables") or data.get("variables") id = request.GET.get("id") or data.get("id") - if variables and isinstance(variables, six.text_type): + if variables and isinstance(variables, str): try: variables = json.loads(variables) except Exception: @@ -391,7 +390,7 @@ class GraphQLView(View): if isinstance(error, GraphQLError): return format_graphql_error(error) - return {"message": six.text_type(error)} + return {"message": str(error)} @staticmethod def get_content_type(request): diff --git a/setup.py b/setup.py index 640fb7f..38b6d90 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,6 @@ setup( keywords="api graphql protocol rest relay graphene", packages=find_packages(exclude=["tests", "examples", "examples.*"]), install_requires=[ - "six>=1.10.0", "graphene>=2.1.7,<3", "graphql-core>=2.1.0,<3", "Django>=1.11",