[WIP] Nix Python 2.7

.travis.yml

@@ -28,13 +28,6 @@ matrix:
     - python: 3.8
       env: TOXENV=mypy
 
-    - python: 2.7
-      env: TOXENV=coverage-py27-tw171,codecov
-    - python: 2.7
-      env: TOXENV=coverage-py27-tw184,codecov
-    - python: 2.7
-      env: TOXENV=coverage-py27-twcurrent,codecov
-
     - python: 3.5
       env: TOXENV=coverage-py35-tw171,codecov
     - python: 3.5
@@ -63,13 +56,6 @@ matrix:
     - python: 3.8
       env: TOXENV=coverage-py38-twcurrent,codecov
 
-    - python: pypy
-      env: TOXENV=coverage-pypy2-tw171,codecov
-    - python: pypy
-      env: TOXENV=coverage-pypy2-tw184,codecov
-    - python: pypy
-      env: TOXENV=coverage-pypy2-twcurrent,codecov
-
     - python: pypy3
       env: TOXENV=coverage-pypy3-tw171,codecov
     - python: pypy3
@@ -79,19 +65,16 @@ matrix:
 
     # Test against Twisted trunk in case something in development breaks us.
     # This is allowed to fail below, since the bug may be in Twisted.
-    - python: 2.7
-      env: TOXENV=coverage-py27-twtrunk,codecov
     - python: 3.8
       env: TOXENV=coverage-py38-twtrunk,codecov
 
-    - python: 2.7
+    - python: 3.8
       env: TOXENV=docs
-    - python: 2.7
+    - python: 3.8
       env: TOXENV=docs-linkcheck
 
   allow_failures:
     # Tests against Twisted trunk are allow to fail, as they are not supported.
-    - env: TOXENV=coverage-py27-twtrunk,codecov
     - env: TOXENV=coverage-py38-twtrunk,codecov
 
     # This depends on external web sites, so it's allowed to fail.

CONTRIBUTING.rst

@@ -13,12 +13,12 @@ Klein is an open source project that welcomes contributions of all kinds coming
 Getting started
 ===============
 
-Here is a list of shell commands that will install the dependencies of Klein, run the test suite with Python 2.7 and the current version of Twisted, compile the documentation, and check for coding style issues with flake8.
+Here is a list of shell commands that will install the dependencies of Klein, run the test suite with Python 3.8 and the current version of Twisted, compile the documentation, and check for coding style issues with flake8.
 
 .. code-block:: shell
 
    pip install --user tox
-   tox -e py27-twcurrent
+   tox -e py38-twcurrent
    tox -e docs
    tox -e flake8
 

setup.py

@@ -12,7 +12,6 @@
             'License :: OSI Approved :: MIT License',
             'Operating System :: OS Independent',
             'Programming Language :: Python',
-            'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: 3.7',

src/klein/__init__.py

@@ -2,7 +2,18 @@
 
 from typing import TYPE_CHECKING
 
-from ._app import Klein, handle_errors, route, run, subroute, urlFor, url_for
+from ._app import (
+    Klein,
+    KleinErrorHandler,
+    KleinRenderable,
+    KleinRoute,
+    handle_errors,
+    route,
+    run,
+    subroute,
+    urlFor,
+    url_for,
+)
 from ._dihttp import RequestComponent, RequestURL, Response
 from ._form import Field, FieldValues, Form, RenderableForm
 from ._plating import Plating
@@ -14,12 +25,15 @@
     # Inform mypy of import shenanigans.
     from .resource import _SpecialModuleObject
 
-    resource = _SpecialModuleObject()
+    resource = _SpecialModuleObject(None)
 else:
     from . import resource
 
 __all__ = (
     "Klein",
+    "KleinErrorHandler",
+    "KleinRenderable",
+    "KleinRoute",
     "Plating",
     "Field",
     "FieldValues",