Remove six usages & references

This commit is contained in:
Ülgen Sarıkavak 2022-02-07 18:02:22 +03:00
parent c1a2f1b5a8
commit b659aa62bd
9 changed files with 8 additions and 18 deletions

View File

@ -5,7 +5,6 @@ import json
from threading import local from threading import local
from time import time from time import time
import six
from django.utils.encoding import force_str from django.utils.encoding import force_str
from .types import DjangoDebugSQL from .types import DjangoDebugSQL
@ -77,7 +76,7 @@ class NormalCursorWrapper:
self.logger = logger self.logger = logger
def _quote_expr(self, element): def _quote_expr(self, element):
if isinstance(element, six.string_types): if isinstance(element, str):
return "'%s'" % force_str(element).replace("'", "''") return "'%s'" % force_str(element).replace("'", "''")
else: else:
return repr(element) return repr(element)

View File

@ -1,6 +1,5 @@
from functools import partial from functools import partial
import six
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
from graphql_relay.connection.arrayconnection import ( from graphql_relay.connection.arrayconnection import (
connection_from_list_slice, connection_from_list_slice,

View File

@ -1,5 +1,3 @@
import six
import graphene import graphene
from django import forms from django import forms

View File

@ -13,7 +13,6 @@ back to the defaults.
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
import six
from django.conf import settings from django.conf import settings
from django.test.signals import setting_changed from django.test.signals import setting_changed
@ -62,7 +61,7 @@ def perform_import(val, setting_name):
""" """
if val is None: if val is None:
return None return None
elif isinstance(val, six.string_types): elif isinstance(val, str):
return import_from_string(val, setting_name) return import_from_string(val, setting_name)
elif isinstance(val, (list, tuple)): elif isinstance(val, (list, tuple)):
return [import_from_string(item, setting_name) for item in val] return [import_from_string(item, setting_name) for item in val]

View File

@ -2,7 +2,7 @@ from textwrap import dedent
from django.core import management from django.core import management
from mock import mock_open, patch from mock import mock_open, patch
from six import StringIO from io import StringIO
from graphene import ObjectType, Schema, String from graphene import ObjectType, Schema, String

View File

@ -1,7 +1,6 @@
import warnings import warnings
from collections import OrderedDict from collections import OrderedDict
import six
from django.db.models import Model from django.db.models import Model
from django.utils.functional import SimpleLazyObject from django.utils.functional import SimpleLazyObject
@ -21,7 +20,6 @@ from .utils import (
is_valid_django_model, is_valid_django_model,
) )
if six.PY3:
from typing import Type from typing import Type

View File

@ -1,6 +1,5 @@
import inspect import inspect
import six
from django.db import connection, models, transaction from django.db import connection, models, transaction
from django.db.models.manager import Manager from django.db.models.manager import Manager
from django.utils.encoding import force_str from django.utils.encoding import force_str
@ -27,13 +26,13 @@ def isiterable(value):
def _camelize_django_str(s): def _camelize_django_str(s):
if isinstance(s, Promise): if isinstance(s, Promise):
s = force_str(s) 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): def camelize(data):
if isinstance(data, dict): if isinstance(data, dict):
return {_camelize_django_str(k): camelize(v) for k, v in data.items()} 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 [camelize(d) for d in data]
return data return data

View File

@ -2,7 +2,6 @@ import inspect
import json import json
import re import re
import six
from django.db import connection, transaction from django.db import connection, transaction
from django.http import HttpResponse, HttpResponseNotAllowed from django.http import HttpResponse, HttpResponseNotAllowed
from django.http.response import HttpResponseBadRequest from django.http.response import HttpResponseBadRequest
@ -374,7 +373,7 @@ class GraphQLView(View):
variables = request.GET.get("variables") or data.get("variables") variables = request.GET.get("variables") or data.get("variables")
id = request.GET.get("id") or data.get("id") id = request.GET.get("id") or data.get("id")
if variables and isinstance(variables, six.text_type): if variables and isinstance(variables, str):
try: try:
variables = json.loads(variables) variables = json.loads(variables)
except Exception: except Exception:
@ -391,7 +390,7 @@ class GraphQLView(View):
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)}
@staticmethod @staticmethod
def get_content_type(request): def get_content_type(request):

View File

@ -56,7 +56,6 @@ setup(
keywords="api graphql protocol rest relay graphene", keywords="api graphql protocol rest relay graphene",
packages=find_packages(exclude=["tests", "examples", "examples.*"]), packages=find_packages(exclude=["tests", "examples", "examples.*"]),
install_requires=[ install_requires=[
"six>=1.10.0",
"graphene>=2.1.7,<3", "graphene>=2.1.7,<3",
"graphql-core>=2.1.0,<3", "graphql-core>=2.1.0,<3",
"Django>=1.11", "Django>=1.11",