more cleanup, dropping 2.6 support

Author: eliasdorneles

CONTRIBUTING.rst

@@ -99,7 +99,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7 and for PyPy. Check
+3. The pull request should work for Python 2.7 and for PyPy. Check
    https://travis-ci.org/scrapinghub/skinfer/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

setup.py

@@ -8,13 +8,6 @@
 readme = open('README.rst').read()
 history = open('HISTORY.rst').read().replace('.. :changelog:', '')
 
-requirements = [
-    'json-schema-generator >= 0.3'
-]
-
-test_requirements = [
-    # put package test requirements here
-]
 
 setup(
     name='skinfer',
@@ -34,7 +27,9 @@
         'bin/json_schema_merger',
     ],
     include_package_data=True,
-    install_requires=requirements,
+    install_requires=[
+        'json-schema-generator >= 0.3'
+    ],
     license="BSD",
     zip_safe=False,
     keywords='skinfer json-schema json schema inferer merger',
@@ -44,12 +39,10 @@
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         "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',
     ],
     test_suite='tests',
-    tests_require=test_requirements
 )

skinfer/json_schema_merger.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import absolute_import, print_function
 import itertools
 import sys
 

skinfer/schema_inferer.py

@@ -1,27 +1,14 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import absolute_import, print_function
 
 import json
 import gzip
 from skinfer.draft4_generator import IncompleteDraft4SchemaGenerator
 from skinfer.json_schema_merger import merge_schema
 
 
-class GzipFileShim(gzip.GzipFile):
-    """Python 2.6 Shim
-    See https://mail.python.org/pipermail/tutor/2009-November/072959.html
-    """
-    def __enter__(self):
-        if self.fileobj is None:
-            raise ValueError("I/O operation on closed GzipFile object")
-        return self
-
-    def __exit__(self, *args):
-        self.close()
-
-
 def gzopen(filename):
     if '.gz' in filename:
-        return GzipFileShim(filename)
+        return gzip.GzipFile(filename)
 
     return open(filename)
 

tests/fixtures.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import os
 import json
 

tests/test_draft4_generator.py

@@ -23,10 +23,6 @@ def test_object_with_nested_properties(self):
         self.assertEqual(generate_schema({"something": {"nested_required": "1"}}),
                          fixtures.REQUIRING_SOME_PROPERTY_WITH_NESTED_REQUIRED_PROPERTY)
 
-    def assertIn(self, a, b):
-        """polyfill for python 2.6"""
-        self.assertTrue(a in b, "%r not found in %r" % (a, b))
-
     def assertSchemaEqual(self, schema1, schema2):
         self.assertEqual(len(schema1), len(schema2))
         self.assertEqual(schema1.get('type'), schema2.get('type'))

tests/test_json_schema_merger.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import absolute_import, print_function
 from skinfer.json_schema_merger import merge_schema
 import unittest
 from tests import fixtures

tests/test_schema_inferer.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import absolute_import, print_function
 import unittest
 import json
 from tests import fixtures
 from skinfer import schema_inferer
-import subprocess
+from subprocess import check_output
 
 
 class TestJsonSchemaInferer(unittest.TestCase):
@@ -39,28 +39,6 @@ def test_load_jsonlines_samples(self):
         self.assertEquals(3, len(samples))
 
 
-def check_output(*popenargs, **kwargs):
-    r"""Run command with arguments and return its output as a byte string.
-
-    Backported from Python 2.7 as it's implemented as pure python on stdlib.
-
-    >>> check_output(['/usr/bin/python', '--version'])
-    Python 2.6.2
-    """
-    # FROM: https://gist.github.com/edufelipe/1027906
-    process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
-    output, unused_err = process.communicate()
-    retcode = process.poll()
-    if retcode:
-        cmd = kwargs.get("args")
-        if cmd is None:
-            cmd = popenargs[0]
-        error = subprocess.CalledProcessError(retcode, cmd)
-        error.output = output
-        raise error
-    return output
-
-
 class TestCasePython26Shim(unittest.TestCase):
     def assertIsNotNone(self, value):
         self.assertFalse(value is None, "%r is not None" % value)