From 55d88d717f1630f8a5124fcb6ed4719b5dae6d9a Mon Sep 17 00:00:00 2001 From: Muslim Beibytuly Date: Sun, 4 Oct 2020 20:54:27 +0600 Subject: [PATCH] Remove six compatibility code --- redis_cache/utils.py | 6 ++---- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/redis_cache/utils.py b/redis_cache/utils.py index 35e781c6..0733a29b 100644 --- a/redis_cache/utils.py +++ b/redis_cache/utils.py @@ -2,9 +2,7 @@ import warnings from django.core.exceptions import ImproperlyConfigured -from django.utils.encoding import force_text -from six import python_2_unicode_compatible, string_types -from six.moves.urllib.parse import parse_qs, urlparse +from urllib.parse import parse_qs, urlparse from redis.connection import SSLConnection @@ -13,7 +11,7 @@ def get_servers(location): """Returns a list of servers given the server argument passed in from Django. """ - if isinstance(location, string_types): + if isinstance(location, str): servers = location.split(',') elif hasattr(location, '__iter__'): servers = location diff --git a/requirements.txt b/requirements.txt index 947ddf44..b89f9f58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ redis<4.0 -six + diff --git a/setup.py b/setup.py index f3c52475..65932a92 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ license="BSD", packages=["redis_cache", "redis_cache.backends"], description="Redis Cache Backend for Django", - install_requires=['redis<4.0', 'six'], + install_requires=['redis<4.0'], classifiers=[ "Programming Language :: Python", "Programming Language :: Python :: 2.7",