Merge pull request #196 from dlax/drop-py26

Drop support for python 2.6

.travis.yml

@@ -4,9 +4,6 @@ matrix:
   include:
     - python: 3.8
       env: TOXENV=about,pydocstyle,pylint,flake8,flake8_tests,mypy,sphinx COVERAGE_ID=travis-ci
-    - python: 2.6
-      env: TOXENV=py26,codecov TEST_QUICK=1 COVERAGE_ID=travis-ci
-      dist: trusty
     - python: 2.7
       env: TOXENV=py27,codecov COVERAGE_ID=travis-ci TEST_KEYBOARD=yes TEST_RAW=yes
     - python: 3.4
@@ -41,7 +38,6 @@ matrix:
       env: PATH=/c/Python38:/c/Python38/Scripts:$PATH TOXENV=py38,codecov COVERAGE_ID=travis-ci TEST_KEYBOARD=no
 
   allow_failures:
-    - python: 2.6
     - python: 3.9-dev
     - python: 3.10-dev
 

blessed/_capabilities.py

@@ -1,12 +1,8 @@
 """Terminal capability builder patterns."""
 # std imports
 import re
+from collections import OrderedDict
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    # python 2.6 requires 3rd party library (backport)
-    from ordereddict import OrderedDict  # type: ignore  # pylint: disable=import-error
 
 __all__ = (
     'CAPABILITY_DATABASE',

blessed/keyboard.py

@@ -4,16 +4,11 @@
 import re
 import time
 import platform
+from collections import OrderedDict
 
 # 3rd party
 import six
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    # python 2.6 requires 3rd party library (backport)
-    from ordereddict import OrderedDict  # pylint: disable=import-error
-
 # curses
 if platform.system() == 'Windows':
     # pylint: disable=import-error

blessed/terminal.py

@@ -44,12 +44,6 @@
     # pylint: disable=redefined-builtin
     InterruptedError = select.error
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    # python 2.6 requires 3rd party library (backport)
-    from ordereddict import OrderedDict  # pylint: disable=import-error
-
 
 HAS_TTY = True
 if platform.system() == 'Windows':
@@ -278,7 +272,7 @@ def __clear_color_capabilities(self):
     def __init__capabilities(self):
         # important that we lay these in their ordered direction, so that our
         # preferred, 'color' over 'set_a_attributes1', for example.
-        self.caps = OrderedDict()
+        self.caps = collections.OrderedDict()
 
         # some static injected patterns, esp. without named attribute access.
         for name, (attribute, pattern) in CAPABILITIES_ADDITIVES.items():

setup.cfg

@@ -9,8 +9,5 @@ ignore_missing_imports = True
 [mypy-jinxed.*]
 ignore_missing_imports = True
 
-[mypy-ordereddict.*]
-ignore_missing_imports = True
-
 [mypy-wcwidth.*]
 ignore_missing_imports = True

setup.py

@@ -30,6 +30,7 @@ def _get_long_description(fname):
     name='blessed',
     version=_get_version(
         fname=os.path.join(HERE, 'version.json')),
+    python_requires=">=2.7",
     install_requires=_get_install_requires(
         fname=os.path.join(HERE, 'requirements.txt')),
     long_description=_get_long_description(
@@ -68,7 +69,6 @@ def _get_long_description(fname):
         'Operating System :: POSIX',
         'Operating System :: Microsoft :: Windows',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',

tests/test_core.py

@@ -253,29 +253,6 @@ def child():
     child()
 
 
-def test_missing_ordereddict_uses_module(monkeypatch):
-    """ordereddict module is imported when without collections.OrderedDict."""
-    import blessed.keyboard
-
-    if hasattr(collections, 'OrderedDict'):
-        monkeypatch.delattr('collections.OrderedDict')
-
-    try:
-        reload_module(blessed.keyboard)
-    except ImportError as err:
-        assert err.args[0] in ("No module named ordereddict",  # py2
-                               "No module named 'ordereddict'")  # py3
-        sys.modules['ordereddict'] = mock.Mock()
-        sys.modules['ordereddict'].OrderedDict = -1
-        reload_module(blessed.keyboard)
-        assert blessed.keyboard.OrderedDict == -1
-        del sys.modules['ordereddict']
-        monkeypatch.undo()
-        reload_module(blessed.keyboard)
-    else:
-        assert platform.python_version_tuple() < ('2', '7')  # reached by py2.6
-
-
 def test_python3_2_raises_exception(monkeypatch):
     """Test python version 3.0 through 3.2 raises an exception."""
     import blessed

tox.ini

@@ -9,7 +9,7 @@ envlist = about
           pydocstyle
           mypy
           sphinx
-          py{26,27,34,35,36,37,38}
+          py{27,34,35,36,37,38}
 skip_missing_interpreters = true
 
 [testenv]
@@ -80,20 +80,6 @@ ignore = D101,  # Missing docstring in public class
 [doc8]
 max-line-length = 100
 
-[testenv:py26]
-setenv = TEST_QUICK=1
-basepython = python2.6
-deps = pytest==3.2.5
-       pytest-cov==2.5.1
-       pytest-xdist==1.20.1
-       mock==2.0.0
-commands = {envpython} -m pytest --cov-config={toxinidir}/tox.ini {posargs:\
-             --strict --verbose \
-             --junit-xml=.tox/results.{envname}.xml \
-             --durations=3 \
-             } \
-          tests
-
 [testenv:py27]
 basepython = python2.7
 setenv = TEST_KEYBOARD = {env:TEST_KEYBOARD:yes}