diff --git a/purge_static/cdn/cloudflare.py b/purge_static/cdn/cloudflare.py index fac4e21..4f85170 100644 --- a/purge_static/cdn/cloudflare.py +++ b/purge_static/cdn/cloudflare.py @@ -2,7 +2,6 @@ import json import sys import requests -import six from purge_static.utils import chunk @@ -24,17 +23,17 @@ class CloudFlareCDN(object): self.api_token = credentials.get('api_token') if self.api_token: - if not isinstance(self.api_token, six.string_types): + if not isinstance(self.api_token, str): sys.exit('In credentials file: key "api_token" should map to a string') self.email = self.api_key = None else: self.email = credentials.get('email') - if not isinstance(self.email, six.string_types): + if not isinstance(self.email, str): sys.exit('In credentials file: key "email" should map to a string') self.api_key = credentials.get('api_key') - if not isinstance(self.api_key, six.string_types): + if not isinstance(self.api_key, str): sys.exit('In credentials file: key "api_key" should map to a string') self.zone = args.zone diff --git a/setup.py b/setup.py index 64cf5ad..4793530 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup( long_description_content_type='text/markdown', license='MIT', keywords='cloudflare cdn static cache purge', - install_requires=['requests', 'six'], + install_requires=['requests'], classifiers=[ 'Development Status :: 3 - Alpha', 'Environment :: Console', @@ -35,15 +35,11 @@ setup( 'Operating System :: POSIX', 'Operating System :: Microsoft :: Windows', 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Topic :: Internet :: WWW/HTTP :: Site Management', 'Topic :: System :: Systems Administration', 'Topic :: Utilities',