appply black

Author: graingert

pytest_httpbin/__init__.py

@@ -6,7 +6,7 @@
 version_file = os.path.join(here, "version.py")
 
 with open(version_file) as f:
-    code = compile(f.read(), version_file, 'exec')
+    code = compile(f.read(), version_file, "exec")
     exec(code)
 
 use_class_based_httpbin = pytest.mark.usefixtures("class_based_httpbin")

pytest_httpbin/certs.py

@@ -15,7 +15,8 @@
 def where():
     """Return the preferred certificate bundle."""
     # vendored bundle inside Requests
-    return os.path.join(os.path.dirname(__file__), 'certs', 'cacert.pem')
+    return os.path.join(os.path.dirname(__file__), "certs", "cacert.pem")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     print(where())

pytest_httpbin/plugin.py

@@ -5,39 +5,41 @@
 
 from . import certs, serve
 
-@pytest.fixture(scope='session')
+
+@pytest.fixture(scope="session")
 def httpbin(request):
     server = serve.Server(application=httpbin_app)
     server.start()
     request.addfinalizer(server.stop)
     return server
 
 
-@pytest.fixture(scope='session')
+@pytest.fixture(scope="session")
 def httpbin_secure(request):
     server = serve.SecureServer(application=httpbin_app)
     server.start()
     request.addfinalizer(server.stop)
     return server
 
 
-@pytest.fixture(scope='session', params=['http', 'https'])
+@pytest.fixture(scope="session", params=["http", "https"])
 def httpbin_both(request, httpbin, httpbin_secure):
-    if request.param == 'http':
+    if request.param == "http":
         return httpbin
-    elif request.param == 'https':
+    elif request.param == "https":
         return httpbin_secure
 
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def class_based_httpbin(request, httpbin):
     request.cls.httpbin = httpbin
 
-@pytest.fixture(scope='class')
+
+@pytest.fixture(scope="class")
 def class_based_httpbin_secure(request, httpbin_secure):
     request.cls.httpbin_secure = httpbin_secure
 
 
-@pytest.fixture(scope='function')
+@pytest.fixture(scope="function")
 def httpbin_ca_bundle(monkeypatch):
-    monkeypatch.setenv('REQUESTS_CA_BUNDLE', certs.where())
+    monkeypatch.setenv("REQUESTS_CA_BUNDLE", certs.where())

pytest_httpbin/serve.py

@@ -6,29 +6,28 @@
 
 from six.moves.urllib.parse import urljoin
 
-CERT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'certs')
+CERT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "certs")
 
 
 class ServerHandler(SimpleHandler):
 
-    server_software = 'Pytest-HTTPBIN/0.1.0'
-    http_version = '1.1'
+    server_software = "Pytest-HTTPBIN/0.1.0"
+    http_version = "1.1"
 
     def cleanup_headers(self):
         SimpleHandler.cleanup_headers(self)
-        self.headers['Connection'] = 'Close'
+        self.headers["Connection"] = "Close"
 
     def close(self):
         try:
             self.request_handler.log_request(
-                self.status.split(' ', 1)[0], self.bytes_sent
+                self.status.split(" ", 1)[0], self.bytes_sent
             )
         finally:
             SimpleHandler.close(self)
 
 
 class Handler(WSGIRequestHandler):
-
     def handle(self):
         """Handle a single HTTP request"""
 
@@ -39,7 +38,7 @@ def handle(self):
         handler = ServerHandler(
             self.rfile, self.wfile, self.get_stderr(), self.get_environ()
         )
-        handler.request_handler = self      # backpointer for logging
+        handler.request_handler = self  # backpointer for logging
         handler.run(self.server.get_app())
 
     def get_environ(self):
@@ -49,13 +48,12 @@ def get_environ(self):
         """
         # Note: Can't use super since this is an oldstyle class in python 2.x
         environ = WSGIRequestHandler.get_environ(self).copy()
-        if self.headers.get('content-type') is None:
-            del environ['CONTENT_TYPE']
+        if self.headers.get("content-type") is None:
+            del environ["CONTENT_TYPE"]
         return environ
 
 
 class SecureWSGIServer(WSGIServer):
-
     def finish_request(self, request, client_address):
         """
         Negotiates SSL and then mimics BaseServer behavior.
@@ -64,12 +62,12 @@ def finish_request(self, request, client_address):
         try:
             ssock = ssl.wrap_socket(
                 request,
-                keyfile=os.path.join(CERT_DIR, 'key.pem'),
-                certfile=os.path.join(CERT_DIR, 'cert.pem'),
+                keyfile=os.path.join(CERT_DIR, "key.pem"),
+                certfile=os.path.join(CERT_DIR, "cert.pem"),
                 server_side=True,
                 suppress_ragged_eofs=False,
             )
-            self.base_environ['HTTPS'] = 'yes'
+            self.base_environ["HTTPS"] = "yes"
             self.RequestHandlerClass(ssock, client_address, self)
         except Exception as e:
             print("pytest-httpbin server hit an exception serving request: %s" % e)
@@ -83,30 +81,26 @@ class Server(object):
     HTTP server running a WSGI application in its own thread.
     """
 
-    port_envvar = 'HTTPBIN_HTTP_PORT'
+    port_envvar = "HTTPBIN_HTTP_PORT"
 
-    def __init__(self, host='127.0.0.1', port=0, application=None, **kwargs):
+    def __init__(self, host="127.0.0.1", port=0, application=None, **kwargs):
         self.app = application
         if self.port_envvar in os.environ:
             port = int(os.environ[self.port_envvar])
         self._server = make_server(
-            host,
-            port,
-            self.app,
-            handler_class=Handler,
-            **kwargs
+            host, port, self.app, handler_class=Handler, **kwargs
         )
         self.host = self._server.server_address[0]
         self.port = self._server.server_address[1]
-        self.protocol = 'http'
+        self.protocol = "http"
 
         self._thread = threading.Thread(
             name=self.__class__,
             target=self._server.serve_forever,
         )
 
     def __del__(self):
-        if hasattr(self, '_server'):
+        if hasattr(self, "_server"):
             self.stop()
 
     def start(self):
@@ -120,16 +114,16 @@ def stop(self):
 
     @property
     def url(self):
-        return '{0}://{1}:{2}'.format(self.protocol, self.host, self.port)
+        return "{0}://{1}:{2}".format(self.protocol, self.host, self.port)
 
     def join(self, url, allow_fragments=True):
         return urljoin(self.url, url, allow_fragments=allow_fragments)
 
 
 class SecureServer(Server):
-    port_envvar = 'HTTPBIN_HTTPS_PORT'
+    port_envvar = "HTTPBIN_HTTPS_PORT"
 
-    def __init__(self, host='127.0.0.1', port=0, application=None, **kwargs):
-        kwargs['server_class'] = SecureWSGIServer
+    def __init__(self, host="127.0.0.1", port=0, application=None, **kwargs):
+        kwargs["server_class"] = SecureWSGIServer
         super(SecureServer, self).__init__(host, port, application, **kwargs)
-        self.protocol = 'https'
+        self.protocol = "https"

pytest_httpbin/version.py

@@ -1 +1 @@
-__version__ = '1.0.2'
+__version__ = "1.0.2"

setup.py

@@ -5,62 +5,54 @@
 
 __version__ = None
 with open("pytest_httpbin/version.py") as f:
-    code = compile(f.read(), "pytest_httpbin/version.py", 'exec')
+    code = compile(f.read(), "pytest_httpbin/version.py", "exec")
     exec(code)
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 # Get the long description from the relevant file
-with codecs.open(os.path.join(here, 'DESCRIPTION.rst'), encoding='utf-8') as f:
+with codecs.open(os.path.join(here, "DESCRIPTION.rst"), encoding="utf-8") as f:
     long_description = f.read()
 
 setup(
     name="pytest-httpbin",
-
     # There are various approaches to referencing the version. For a discussion,
     # see http://packaging.python.org/en/latest/tutorial.html#version
     version=__version__,
-
     description="Easily test your HTTP library against a local copy of httpbin",
     long_description=long_description,
     long_description_content_type="text/x-rst",
-
     # The project URL.
-    url='https://github.com/kevin1024/pytest-httpbin',
-
+    url="https://github.com/kevin1024/pytest-httpbin",
     # Author details
-    author='Kevin McCarthy',
-    author_email='me@kevinmccarthy.org',
-
+    author="Kevin McCarthy",
+    author_email="me@kevinmccarthy.org",
     # Choose your license
-    license='MIT',
-
+    license="MIT",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Testing',
-        'Topic :: Software Development :: Libraries',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Testing",
+        "Topic :: Software Development :: Libraries",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
-
     # What does your project relate to?
-    keywords='pytest-httpbin testing pytest httpbin',
+    keywords="pytest-httpbin testing pytest httpbin",
     packages=find_packages(exclude=["contrib", "docs", "tests*"]),
-    include_package_data = True, # include files listed in MANIFEST.in
-    install_requires = ['httpbin','six'],
-    extras_require = {"test": ["requests", "pytest"]},
-    python_requires = ">=3.7",
-
+    include_package_data=True,  # include files listed in MANIFEST.in
+    install_requires=["httpbin", "six"],
+    extras_require={"test": ["requests", "pytest"]},
+    python_requires=">=3.7",
     # the following makes a plugin available to pytest
-    entry_points = {
-        'pytest11': [
-            'httpbin = pytest_httpbin.plugin',
+    entry_points={
+        "pytest11": [
+            "httpbin = pytest_httpbin.plugin",
         ]
     },
 )

tests/conftest.py

@@ -1,7 +1,6 @@
 import pytest
 
 
-
-@pytest.fixture(autouse=True, scope='function')
+@pytest.fixture(autouse=True, scope="function")
 def httpbin_ca_bundle_autoused(httpbin_ca_bundle):
     pass

tests/test_httpbin.py

@@ -10,46 +10,48 @@ def test_httpbin_gets_injected(httpbin):
 
 
 def test_httpbin_accepts_get_requests(httpbin):
-    assert requests.get(httpbin.url + '/get').status_code == 200
+    assert requests.get(httpbin.url + "/get").status_code == 200
 
 
 def test_httpbin_secure_accepts_get_requests(httpbin_secure):
-    assert requests.get(httpbin_secure.url + '/get').status_code == 200
+    assert requests.get(httpbin_secure.url + "/get").status_code == 200
 
 
 def test_httpbin_secure_accepts_lots_of_get_requests(httpbin_secure):
     for i in range(10):
-        assert requests.get(httpbin_secure.url + '/get').status_code == 200
+        assert requests.get(httpbin_secure.url + "/get").status_code == 200
 
 
 def test_httpbin_accepts_lots_of_get_requests_in_single_session(httpbin):
     session = requests.Session()
 
     for i in range(10):
-        assert session.get(httpbin.url + '/get').status_code == 200
+        assert session.get(httpbin.url + "/get").status_code == 200
 
 
 def test_httpbin_both(httpbin_both):
     # this test will get called twice, once with an http url, once with an
     # https url
-    assert requests.get(httpbin_both.url + '/get').status_code == 200
+    assert requests.get(httpbin_both.url + "/get").status_code == 200
 
 
 def test_httpbin_join(httpbin):
-    assert httpbin.join('foo') == httpbin.url + '/foo'
+    assert httpbin.join("foo") == httpbin.url + "/foo"
 
 
 def test_httpbin_str(httpbin):
-    assert httpbin + '/foo' == httpbin.url + '/foo'
+    assert httpbin + "/foo" == httpbin.url + "/foo"
+
 
 def test_chunked_encoding(httpbin_both):
-    assert requests.get(httpbin_both.url + '/stream/20').status_code == 200
+    assert requests.get(httpbin_both.url + "/stream/20").status_code == 200
+
 
 @pytest_httpbin.use_class_based_httpbin
 @pytest_httpbin.use_class_based_httpbin_secure
 class TestClassBassedTests(unittest.TestCase):
     def test_http(self):
-        assert requests.get(self.httpbin.url + '/get').status_code == 200
+        assert requests.get(self.httpbin.url + "/get").status_code == 200
 
     def test_http_secure(self):
-        assert requests.get(self.httpbin_secure.url + '/get').status_code == 200
+        assert requests.get(self.httpbin_secure.url + "/get").status_code == 200