summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kögl <stefan@skoegl.net>2018-01-16 13:01:07 +0100
committerGitHub <noreply@github.com>2018-01-16 13:01:07 +0100
commitebb99789d72f6c7f98f20d20623029ae66db7da8 (patch)
tree2d130974ce36e506089d6e8512e84735541f39b6
parent1345d715c40fc9c4c979bbef576b1eda4aff387e (diff)
parentdf3395ab1db3957e71c5a9701f0d3bb622faf16f (diff)
downloadpython-json-pointer-ebb99789d72f6c7f98f20d20623029ae66db7da8.tar.gz
Merge pull request #28 from hugovk/rm-eol
Drop support for EOL Python 2.6 and 3.3
-rw-r--r--.travis.yml2
-rw-r--r--doc/index.rst2
-rw-r--r--jsonpointer.py2
-rw-r--r--setup.py3
4 files changed, 3 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index bd9a8a3..f67ebbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
language: python
python:
-- '2.6'
- '2.7'
-- '3.3'
- '3.4'
- '3.5'
- '3.6'
diff --git a/doc/index.rst b/doc/index.rst
index dbdf2c6..53b1dea 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -7,7 +7,7 @@ python-json-pointer
===================
*python-json-pointer* is a Python library for resolving JSON pointers (`RFC
-6901 <http://tools.ietf.org/html/rfc6901>`_). Python 2.6, 2.7, 3.2, 3.3
+6901 <http://tools.ietf.org/html/rfc6901>`_). Python 2.7, 3.4+
and PyPy are supported.
**Contents**
diff --git a/jsonpointer.py b/jsonpointer.py
index 285fc0c..a844729 100644
--- a/jsonpointer.py
+++ b/jsonpointer.py
@@ -174,7 +174,7 @@ class JsonPointer(object):
# validate escapes
invalid_escape = self._RE_INVALID_ESCAPE.search(pointer)
if invalid_escape:
- raise JsonPointerException('Found invalid escape {0}'.format(
+ raise JsonPointerException('Found invalid escape {}'.format(
invalid_escape.group()))
parts = pointer.split('/')
diff --git a/setup.py b/setup.py
index f5e850c..21660f5 100644
--- a/setup.py
+++ b/setup.py
@@ -42,10 +42,8 @@ CLASSIFIERS = [
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
@@ -66,4 +64,5 @@ setup(name=PACKAGE,
py_modules=MODULES,
scripts=['bin/jsonpointer'],
classifiers=CLASSIFIERS,
+ python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
)