diff --git a/.travis.yml b/.travis.yml index 4cdbfb3..8bc0217 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ python: - 3.7 - 3.6 - 3.5 - - 2.7 install: - python setup.py install diff --git a/HISTORY.rst b/HISTORY.rst index e4b2569..49dedc7 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,10 @@ History ======= +0.4.0 (2020-03-25) +------------------ + +* Remove py27 support 0.3.0 (2020-03-25) ------------------ diff --git a/domain_utils/domain_utils.py b/domain_utils/domain_utils.py index 2887ce9..2633d6c 100644 --- a/domain_utils/domain_utils.py +++ b/domain_utils/domain_utils.py @@ -1,15 +1,11 @@ -from __future__ import absolute_import -from __future__ import print_function import tempfile import codecs import os -import six from ipaddress import ip_address from functools import wraps from publicsuffix import PublicSuffixList, fetch -from six.moves import range -from six.moves.urllib.parse import urlparse +from urllib.parse import urlparse # We cache the Public Suffix List in temp directory @@ -46,7 +42,7 @@ def is_ip_address(hostname): Check if the given string is a valid IP address """ try: - ip_address(six.text_type(hostname)) + ip_address(str(hostname)) return True except ValueError: return False diff --git a/requirements_dev.txt b/requirements_dev.txt index 2e631d4..7b00080 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,4 +1,3 @@ -pip==19.2.3 bump2version==0.5.11 wheel==0.33.6 watchdog==0.9.0 diff --git a/setup.py b/setup.py index 8b08703..ce887df 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,6 @@ requirements = [ 'ipaddress', 'publicsuffix', - 'six', ] setup_requirements = [ @@ -34,8 +33,6 @@ 'Intended Audience :: Developers', 'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)', 'Natural Language :: English', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6',