Merge pull request #30 from jdufresne/py2

Remove support for end-of-life Pythons

Author: pradyunsg

.github/workflows/ci.yaml

@@ -31,13 +31,10 @@ jobs:
     strategy:
       matrix:
         python:
-          - '2.7'
-          - '3.5'
           - '3.6'
           - '3.7'
           - '3.8'
           - '3.9'
-          - 'pypy2'
           - 'pypy3'
 
     steps:

docs/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Cryptography documentation build configuration file, created by
 # sphinx-quickstart on Tue Aug  6 19:19:14 2013.
 #

scripttest.py

@@ -16,23 +16,18 @@
 
 if sys.platform == 'win32':
     def clean_environ(e):
-        ret = dict(
-            ((str(k), str(v)) for k, v in e.items()))
+        ret = {
+            str(k): str(v) for k, v in e.items()}
         return ret
 else:
     def clean_environ(e):
         return e
 
 
 def string(string):
-    if sys.version_info >= (3,):
-        if isinstance(string, str):
-            return string
-        return str(string, "utf-8")
-    else:
-        if isinstance(string, unicode):  # noqa
-            return string
-        return string.decode('utf-8')
+    if isinstance(string, str):
+        return string
+    return str(string, "utf-8")
 
 
 # From pathutils by Michael Foord:
@@ -60,7 +55,7 @@ def onerror(func, path, exc_info):
 __all__ = ['TestFileEnvironment']
 
 
-class TestFileEnvironment(object):
+class TestFileEnvironment:
 
     """
     This represents an environment in which files will be written, and
@@ -331,7 +326,7 @@ def assert_no_temp(self):
             % ', '.join(sorted(names)))
 
 
-class ProcResult(object):
+class ProcResult:
 
     """
     Represents the results of running a command in
@@ -462,7 +457,7 @@ def __str__(self):
         return '\n'.join(s)
 
 
-class FoundFile(object):
+class FoundFile:
 
     """
     Represents a single file found as the result of a command.
@@ -536,7 +531,7 @@ def mustcontain(self, s):
             assert s in bytes
 
     def __repr__(self):
-        return '<%s %s:%s>' % (
+        return '<{} {}:{}>'.format(
             self.__class__.__name__,
             self.base_path, self.path)
 
@@ -550,11 +545,8 @@ def __eq__(self, other):
             self.size == other.size
         )
 
-    def __ne__(self, other):
-        return not self == other
-
 
-class FoundDir(object):
+class FoundDir:
 
     """
     Represents a directory created by a command.
@@ -573,7 +565,7 @@ def __init__(self, base_path, path):
         self.mtime = self.stat.st_mtime
 
     def __repr__(self):
-        return '<%s %s:%s>' % (
+        return '<{} {}:{}>'.format(
             self.__class__.__name__,
             self.base_path, self.path)
 
@@ -583,9 +575,6 @@ def __eq__(self, other):
 
         return self.mtime == other.mtime
 
-    def __ne__(self, other):
-        return not self == other
-
 
 def _space_prefix(pref, full, sep=None, indent=None, include_sep=True):
     """

setup.cfg

@@ -28,8 +28,15 @@ def run_tests(self):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Topic :: Software Development :: Testing',
-        'Programming Language :: Python :: 2',
+        'Programming Language :: Python',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3 :: Only',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
     ],
     keywords='test unittest doctest command line scripts',
     author='Ian Bicking',

setup.py

@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-
-import pytest
-
-PY2 = pytest.mark.skipif("sys.version_info >= (3, 0)",
-                         reason="Python 3.x only")
-PY3 = pytest.mark.skipif("sys.version_info < (3, 0)",
-                         reason="Python 2.x only")

tests/__init__.py

@@ -1,10 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-
-import sys
-
-from . import PY2, PY3
-
 from scripttest import string
 
 
@@ -13,70 +6,10 @@
     'funny "Unicode" characters.\n\nJust good ol\' ASCII text.',
 ])
 
-if sys.version_info < (3, 0):
-    utf8_str = ''.join([
-        'Bj\xc3\xb6rk Gu\xc3\xb0mundsd\xc3\xb3ttir ',
-        '[\xcb\x88pj\xc5\x93r\xcc\xa5k ',
-        '\xcb\x88kv\xca\x8f\xc3\xb0m\xca\x8fnts\xcb\x8cto\xca\x8aht\xc9\xaar]',
-    ])
-else:
-    utf8_str = 'Björk Guðmundsdóttir [ˈpjœr̥k ˈkvʏðmʏntsˌtoʊhtɪr]'
-
-
-# -----------------------------------------
-# Python 2 tests
-# -----------------------------------------
-
-
-@PY2
-def test_python_2_string_with_ascii_str():
-    assert isinstance(ascii_str, str)
-
-    result = string(ascii_str)
-
-    assert isinstance(result, unicode)  # noqa
-    assert result == ascii_str
-
-
-@PY2
-def test_python_2_string_with_utf8_str():
-    assert isinstance(utf8_str, str)
-
-    result = string(utf8_str)
-
-    assert isinstance(result, unicode)  # noqa
-    assert result == utf8_str.decode('utf-8')
-
-
-@PY2
-def test_python_2_string_with_ascii_unicode():
-    ascii_unicode = ascii_str.decode('utf-8')
-    assert isinstance(ascii_unicode, unicode)  # noqa
-
-    result = string(ascii_unicode)
-
-    assert isinstance(result, unicode)  # noqa
-    assert result == ascii_unicode
-
-
-@PY2
-def test_python_2_string_with_utf8_unicode():
-    utf8_unicode = utf8_str.decode('utf-8')
-    assert isinstance(utf8_unicode, unicode)  # noqa
-
-    result = string(utf8_unicode)
-
-    assert isinstance(result, unicode)  # noqa
-    assert result == utf8_unicode
-
-
-# ------------------------------------------
-# Python 3 tests
-# ----------------------------------------
+utf8_str = 'Björk Guðmundsdóttir [ˈpjœr̥k ˈkvʏðmʏntsˌtoʊhtɪr]'
 
 
-@PY3
-def test_python_3_string_with_ascii_bytes():
+def test_string_with_ascii_bytes():
     ascii_bytes = ascii_str.encode('utf-8')
     assert isinstance(ascii_bytes, bytes)
 
@@ -86,8 +19,7 @@ def test_python_3_string_with_ascii_bytes():
     assert result == ascii_bytes.decode('utf-8')
 
 
-@PY3
-def test_python_3_string_with_utf8_bytes():
+def test_string_with_utf8_bytes():
     utf8_bytes = utf8_str.encode('utf-8')
 
     assert isinstance(utf8_bytes, bytes)
@@ -98,8 +30,7 @@ def test_python_3_string_with_utf8_bytes():
     assert result == utf8_bytes.decode('utf-8')
 
 
-@PY3
-def test_python_3_string_with_ascii_str():
+def test_string_with_ascii_str():
     assert isinstance(ascii_str, str)
 
     result = string(ascii_str)
@@ -108,8 +39,7 @@ def test_python_3_string_with_ascii_str():
     assert result == ascii_str
 
 
-@PY3
-def test_python_3_string_with_utf8_str():
+def test_string_with_utf8_str():
     assert isinstance(utf8_str, str)
 
     result = string(utf8_str)

tests/test_string.py

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,35,36,37,38,39},pypy,pypy3,docs,pep8
+envlist = py{36,37,38,39},pypy3,docs,pep8
 
 [testenv]
 deps = pytest
@@ -9,15 +9,13 @@ commands = py.test
 deps =
     sphinx
     readme_renderer
-basepython = python3
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
     sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs docs/_build/html
     python setup.py check -m -r -s
 
 [testenv:pep8]
 deps = flake8
-basepython = python2
 commands = flake8 scripttest.py tests/ docs/
 
 [flake8]