diff --git a/.gitignore b/.gitignore index b11bdd6..33baecb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.egg-info *.pyc /.coverage +/.python-version /.tox/ /.venv/ /build/ diff --git a/.travis.yml b/.travis.yml index 70c1d3c..6a3e3ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,12 @@ language: python python: - "2.7" - - "3.4" - "3.5" + - "3.6" + - "3.7" + - "3.8" - "pypy" - "pypy3" -sudo: false -matrix: - fast_finish: true install: - pip install wheel tox-travis diff --git a/README.md b/README.md index 8ce94c8..3b3b4c4 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,8 @@ Local documentation can be built using [Sphinx][]: Python Version Compatibility ---------------------------- -[Travis CI][ci-home] automatically runs tests against python 2.7, 3.4, 3.5, -pypy, and pypy3, +[Travis CI][ci-home] automatically runs tests against Python 2.7, 3.5, 3.6, +3.7, 3.8, pypy, and pypy3. Installation ------------ diff --git a/iptools/__init__.py b/iptools/__init__.py index 8d21ce9..3a966f7 100644 --- a/iptools/__init__.py +++ b/iptools/__init__.py @@ -47,7 +47,7 @@ def next(iterable): from . import ipv4 from . import ipv6 -__version__ = '0.7.0-dev' +__version__ = '0.7.0' __all__ = ( 'IpRange', @@ -399,7 +399,7 @@ def __iter__(self): class IpRangeList (object): - """ + r""" List of IpRange objects. Converts a list of ip address and/or CIDR addresses into a list of IpRange diff --git a/iptools/ipv6.py b/iptools/ipv6.py index 9e4c696..073a427 100644 --- a/iptools/ipv6.py +++ b/iptools/ipv6.py @@ -412,12 +412,12 @@ def rfc19242long(s): return None if _RFC1924_REV is None: _RFC1924_REV = {v: k for k, v in enumerate(_RFC1924_ALPHABET)} - l = 0 + x = 0 for c in s: - l = l * 85 + _RFC1924_REV[c] - if l > MAX_IP: + x = x * 85 + _RFC1924_REV[c] + if x > MAX_IP: return None - return l + return x def validate_cidr(s): diff --git a/setup.py b/setup.py index 996ba0c..551a951 100644 --- a/setup.py +++ b/setup.py @@ -32,11 +32,11 @@ 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.5', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Topic :: Utilities', 'Topic :: Internet', ], diff --git a/tox.ini b/tox.ini index a99d698..446681b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py34, py35, pypy, pypy3 +envlist = py27, py35, py36, py37, py38, pypy, pypy3 [testenv] deps = -r{toxinidir}/tests/requirements.txt