apply pyupgrade

Author: graingert

pytest_httpbin/plugin.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import pytest
 from httpbin import app as httpbin_app
 

pytest_httpbin/serve.py

@@ -76,7 +76,7 @@ def finish_request(self, request, client_address):
         # Thanks, WSGIRequestHandler!!
 
 
-class Server(object):
+class Server:
     """
     HTTP server running a WSGI application in its own thread.
     """
@@ -114,7 +114,7 @@ def stop(self):
 
     @property
     def url(self):
-        return "{0}://{1}:{2}".format(self.protocol, self.host, self.port)
+        return f"{self.protocol}://{self.host}:{self.port}"
 
     def join(self, url, allow_fragments=True):
         return urljoin(self.url, url, allow_fragments=allow_fragments)
@@ -125,5 +125,5 @@ class SecureServer(Server):
 
     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)
+        super().__init__(host, port, application, **kwargs)
         self.protocol = "https"

tests/test_server.py

@@ -1,7 +1,3 @@
-# coding=utf8
-# -*- coding: utf8 -*-
-# vim: set fileencoding=utf8 :
-
 import os
 
 import pytest
@@ -27,7 +23,7 @@ def test_unicode_data(httpbin):
     """
     resp = requests.post(
         httpbin + "/post",
-        data="оживлённым".encode("utf-8"),
+        data="оживлённым".encode(),
         headers={
             "content-type": "text/html; charset=utf-8",
         },
@@ -67,7 +63,7 @@ def test_fixed_port_environment_variables(protocol):
         server_cls = serve.SecureServer
         envvar = "HTTPBIN_HTTPS_PORT"
     else:
-        raise RuntimeError("Unexpected protocol param: {0}".format(protocol))
+        raise RuntimeError(f"Unexpected protocol param: {protocol}")
 
     # just have different port to avoid adrress already in use
     # if the second test run too fast after the first one (happens on pypy)