Merge pull request #314 from twisted/black

Fade to black

.gitignore

@@ -1,15 +1,11 @@
 *.pyc
 *~
 .DS_Store
-/.coverage
-/.coverage.*
 /.eggs
 /.hypothesis/
-/.mypy_cache
 /.tox/
-/_trial_temp/
 /build/
 /dist/
 /docs/_build/
+/htmlcov/
 /src/*.egg-info
-htmlcov

.travis.yml

@@ -23,87 +23,83 @@ matrix:
   include:
     - python: 3.8
       env: TOXENV=flake8
+    - python: 3.8
+      env: TOXENV=black
     - python: 3.8
       env: TOXENV=mypy
 
     - python: 2.7
-      env: TOXENV=coverage-py27-tw171,codecov-py27
+      env: TOXENV=coverage-py27-tw171,codecov
     - python: 2.7
-      env: TOXENV=coverage-py27-tw184,codecov-py27
+      env: TOXENV=coverage-py27-tw184,codecov
     - python: 2.7
-      env: TOXENV=coverage-py27-twcurrent,codecov-py27
+      env: TOXENV=coverage-py27-twcurrent,codecov
 
     - python: 3.5
-      env: TOXENV=coverage-py35-tw171,codecov-py35
+      env: TOXENV=coverage-py35-tw171,codecov
     - python: 3.5
-      env: TOXENV=coverage-py35-tw184,codecov-py35
+      env: TOXENV=coverage-py35-tw184,codecov
     - python: 3.5
-      env: TOXENV=coverage-py35-twcurrent,codecov-py35
 
     - python: 3.6
-      env: TOXENV=coverage-py36-tw171,codecov-py36
+      env: TOXENV=coverage-py36-tw171,codecov
     - python: 3.6
-      env: TOXENV=coverage-py36-tw184,codecov-py36
+      env: TOXENV=coverage-py36-tw184,codecov
     - python: 3.6
-      env: TOXENV=coverage-py36-twcurrent,codecov-py36
+      env: TOXENV=coverage-py36-twcurrent,codecov
 
     - python: 3.7
-      env: TOXENV=coverage-py37-tw171,codecov-py37
+      env: TOXENV=coverage-py37-tw171,codecov
     - python: 3.7
-      env: TOXENV=coverage-py37-tw184,codecov-py37
+      env: TOXENV=coverage-py37-tw184,codecov
     - python: 3.7
-      env: TOXENV=coverage-py37-twcurrent,codecov-py37
+      env: TOXENV=coverage-py37-twcurrent,codecov
 
     - python: 3.8
-      env: TOXENV=coverage-py38-tw171,codecov-py38
+      env: TOXENV=coverage-py38-tw171,codecov
     - python: 3.8
-      env: TOXENV=coverage-py38-tw184,codecov-py38
+      env: TOXENV=coverage-py38-tw184,codecov
     - python: 3.8
-      env: TOXENV=coverage-py38-twcurrent,codecov-py38
+      env: TOXENV=coverage-py38-twcurrent,codecov
 
     - python: pypy
-      env: TOXENV=coverage-pypy2-tw171,codecov-pypy2
+      env: TOXENV=coverage-pypy2-tw171,codecov
     - python: pypy
-      env: TOXENV=coverage-pypy2-tw184,codecov-pypy2
+      env: TOXENV=coverage-pypy2-tw184,codecov
     - python: pypy
-      env: TOXENV=coverage-pypy2-twcurrent,codecov-pypy2
+      env: TOXENV=coverage-pypy2-twcurrent,codecov
 
     - python: pypy3
-      env: TOXENV=coverage-pypy3-tw171,codecov-pypy3
+      env: TOXENV=coverage-pypy3-tw171,codecov
     - python: pypy3
-      env: TOXENV=coverage-pypy3-tw184,codecov-pypy3
+      env: TOXENV=coverage-pypy3-tw184,codecov
     - python: pypy3
-      env: TOXENV=coverage-pypy3-twcurrent,codecov-pypy3
+      env: TOXENV=coverage-pypy3-twcurrent,codecov
 
     # 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-py27
+      env: TOXENV=coverage-py27-twtrunk,codecov
     - python: 3.8
-      env: TOXENV=coverage-py38-twtrunk,codecov-py38
+      env: TOXENV=coverage-py38-twtrunk,codecov
 
-    - python: 2.7
-      env: TOXENV=twistedchecker-diff
     - python: 2.7
       env: TOXENV=docs
     - python: 2.7
       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-py27
-    - env: TOXENV=coverage-py38-twtrunk,codecov-py38
-
-    # This is not yet required.
-    - env: TOXENV=twistedchecker-diff
+    - env: TOXENV=coverage-py27-twtrunk,codecov
+    - env: TOXENV=coverage-py38-twtrunk,codecov
 
     # This depends on external web sites, so it's allowed to fail.
     - env: TOXENV=docs-linkcheck
 
 
 install:
-  - ./.travis/install
+  - pip install tox
 
 
 script:
-  - ./.travis/run tox
+  - tox

MANIFEST.in

@@ -1,4 +1,13 @@
-include LICENSE
-include README.rst
+include .coveragerc
+include .travis/twistedchecker-diff
 include AUTHORS
+include CONTRIBUTING.rst
+include docs/Makefile
+include LICENSE
 include NEWS.rst
+include pyproject.toml
+include README.rst
+include tox.ini
+recursive-include docs *.py
+recursive-include docs *.rst
+recursive-include docs *.txt

pyproject.toml

@@ -0,0 +1,10 @@
+[build-system]
+
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+
+[tool.black]
+
+line-length = 80
+target-version = ["py27"]

src/klein/__init__.py

@@ -13,23 +13,24 @@
 if TYPE_CHECKING:
     # Inform mypy of import shenanigans.
     from .resource import _SpecialModuleObject
+
     resource = _SpecialModuleObject()
 else:
     from . import resource
 
 __all__ = (
     "Klein",
     "Plating",
-    'Field',
-    'FieldValues',
-    'Form',
-    'RequestComponent',
-    'RequestURL',
-    'Response',
-    'RenderableForm',
-    'SessionProcurer',
-    'Authorization',
-    'Requirer',
+    "Field",
+    "FieldValues",
+    "Form",
+    "RequestComponent",
+    "RequestURL",
+    "Response",
+    "RenderableForm",
+    "SessionProcurer",
+    "Authorization",
+    "Requirer",
     "__author__",
     "__copyright__",
     "__license__",