Merge branch 'master' into query-separator

Author: Gallaecio

.github/workflows/build.yml

@@ -27,6 +27,12 @@ jobs:
         - python-version: 3.9
           env:
             TOXENV: security
+        - python-version: 3.9
+          env:
+            TOXENV: black
+        - python-version: 3.9
+          env:
+            TOXENV: typing
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -10,3 +10,7 @@ _trial_temp
 .coverage
 coverage.xml
 .cache
+.mypy_cache/
+/index.txt
+.dmypy.json
+.hypothesis/

conftest.py

@@ -5,7 +5,8 @@ def pytest_collection_modifyitems(session, config, items):
     # Avoid executing tests when executing `--flake8` flag (pytest-flake8)
     try:
         from pytest_flake8 import Flake8Item
-        if config.getoption('--flake8'):
+
+        if config.getoption("--flake8"):
             items[:] = [item for item in items if isinstance(item, Flake8Item)]
     except ImportError:
         pass

docs/w3lib.rst

@@ -26,3 +26,6 @@ w3lib Package
 
 .. automodule:: w3lib.url
     :members:
+
+    .. autoclass:: ParseDataURIResult
+       :members:

mypy.ini

@@ -0,0 +1,12 @@
+[mypy]
+exclude = .*flycheck_.*
+show_error_codes = True
+check_untyped_defs = True
+
+[mypy-w3lib.*]
+# All non-tests functions must be typed.
+disallow_untyped_defs = True
+
+[mypy-tests.*]
+# Allow test functions to be untyped
+disallow_untyped_defs = False

pylintrc

@@ -25,6 +25,7 @@ disable=bad-continuation,
         redefined-outer-name,
         too-many-arguments,
         too-many-branches,
+        too-many-lines,
         too-many-public-methods,
         trailing-comma-tuple,
         trailing-newlines,

pytest.ini

@@ -1,11 +1,13 @@
 [pytest]
 doctest_optionflags = ALLOW_UNICODE ALLOW_BYTES
+flake8-max-line-length = 88
 flake8-ignore =
     W503  # https://www.flake8rules.com/rules/W503.html
+    E203  # https://www.flake8rules.com/rules/E203.html
 
-    docs/conf.py E121 E122 E265 E401 E501
+    docs/conf.py E121 E122 E265 E401
     tests/test_encoding.py E128 E221 E241 E302 E401 E501 E731
-    tests/test_form.py E265 E501
+    tests/test_form.py E265
     tests/test_html.py E123 E128 E241 E303 E501 E502
     tests/test_http.py E128 E261 E302 W291
     tests/test_url.py E126 E127 E128 E226 E261 E303 E501 W293 W391

setup.py

@@ -2,29 +2,29 @@
 
 
 setup(
-    name='w3lib',
-    version='1.22.0',
-    license='BSD',
-    description='Library of web-related functions',
-    author='Scrapy project',
-    author_email='[email protected]',
-    url='https://github.com/scrapy/w3lib',
-    packages=find_packages(exclude=('tests', 'tests.*')),
+    name="w3lib",
+    version="1.22.0",
+    license="BSD",
+    description="Library of web-related functions",
+    author="Scrapy project",
+    author_email="[email protected]",
+    url="https://github.com/scrapy/w3lib",
+    packages=find_packages(exclude=("tests", "tests.*")),
     include_package_data=True,
     zip_safe=False,
-    platforms=['Any'],
+    platforms=["Any"],
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        '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',
-        'Topic :: Internet :: WWW/HTTP',
+        "Development Status :: 5 - Production/Stable",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "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",
+        "Topic :: Internet :: WWW/HTTP",
     ],
 )