Add support for Python 3.6-3.7, drop support for 2.6 and 3.4 (#44)

* Drop support for EOL Python 2.6 and 3.4

* Add python_requires to help pip

* Add support for Python 3.6 and 3.7

* Test on Python 3.8 beta

Author: hugovk

.travis.yml

@@ -1,12 +1,10 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.4"
   - "3.5"
-
-# command to install dependencies
-install: "pip install ordereddict simplejson"
+  - "3.6"
+  - "3.7"
+  - "3.8-dev"
 
 # command to run tests
 script: cd test/ && python run_tests.py

README.rst

@@ -203,7 +203,7 @@ Tests
 	cd test/
 	python run_tests.py
 
-Tested with Python 2.6, 2.7 3.4, and 3.5.
+Tested with Python 2.7 and 3.5+.
 
 Contributors
 ------------

json2html/jsonconv.py

@@ -19,12 +19,8 @@
 
 import sys
 
-if sys.version_info[:2] < (2, 7):
-    from ordereddict import OrderedDict
-    import simplejson as json_parser
-else:
-    from collections import OrderedDict
-    import json as json_parser
+from collections import OrderedDict
+import json as json_parser
 
 if sys.version_info[:2] < (3, 0):
     from cgi import escape as html_escape

setup.py

@@ -1,18 +1,10 @@
-import sys
 from setuptools import setup
 
-required = []
-
-
-if sys.version_info[:2] < (2,7):
-    required.append('simplejson')
-    required.append('ordereddict')
 
 setup(
     name = 'json2html',
     packages = ['json2html'],
     version = '1.3.0',
-    install_requires=required,
     description = 'JSON to HTML Table Representation',
     long_description=open('README.rst').read(),
     author = 'Varun Malhotra',
@@ -21,6 +13,14 @@
     download_url = 'https://github.com/softvar/json2html/tarball/1.3.0',
     keywords = ['json', 'HTML', 'Table'],
     license = 'MIT',
-    classifiers = (
-    ),
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
+    classifiers = [
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: Implementation :: CPython',
+    ],
 )

test/run_tests.py

@@ -52,11 +52,10 @@ def test_empty_json(self, *args, **kwargs):
         )
 
     def test_invalid_json_exception(self, *args, **kwargs):
-        if sys.version_info[:2] >= (2, 7): #Python below 2.7 doesn't have assertRaises, ommitting these tests
-            _json = "{'name'}"
-            with self.assertRaises(ValueError) as context:
-                json2html.convert(json = _json)
-            self.assertIn('Expecting property name', str(context.exception))
+        _json = "{'name'}"
+        with self.assertRaises(ValueError) as context:
+            json2html.convert(json = _json)
+        self.assertIn('Expecting property name', str(context.exception))
 
     def test_funky_objects(self):
         class objecty_class1(object):