Skip to content

Commit

Permalink
Remove python 2.7 support
Browse files Browse the repository at this point in the history
  • Loading branch information
birdsarah committed Mar 25, 2020
1 parent e54e854 commit c7d5f00
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 11 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ python:
- 3.7
- 3.6
- 3.5
- 2.7

install:
- python setup.py install
Expand Down
4 changes: 4 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
History
=======

0.4.0 (2020-03-25)
------------------

* Remove py27 support

0.3.0 (2020-03-25)
------------------
Expand Down
8 changes: 2 additions & 6 deletions domain_utils/domain_utils.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
pip==19.2.3
bump2version==0.5.11
wheel==0.33.6
watchdog==0.9.0
Expand Down
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
requirements = [
'ipaddress',
'publicsuffix',
'six',
]

setup_requirements = [
Expand All @@ -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',
Expand Down

0 comments on commit c7d5f00

Please sign in to comment.