diff options
-rw-r--r-- | qutebrowser/browser/webkit/http.py | 2 | ||||
-rw-r--r-- | qutebrowser/browser/webkit/network/networkmanager.py | 4 | ||||
-rw-r--r-- | tests/end2end/conftest.py | 4 | ||||
-rw-r--r-- | tests/end2end/fixtures/webserver_sub.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py index e43d8fdef..fed357e62 100644 --- a/qutebrowser/browser/webkit/http.py +++ b/qutebrowser/browser/webkit/http.py @@ -150,7 +150,7 @@ def parse_content_disposition(reply): """ is_inline = True filename = None - content_disposition_header = 'Content-Disposition'.encode('iso-8859-1') + content_disposition_header = b'Content-Disposition' # First check if the Content-Disposition header has a filename # attribute. if reply.hasRawHeader(content_disposition_header): diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index c97c91d66..17f4736b8 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -379,10 +379,10 @@ class NetworkManager(QNetworkAccessManager): if referer_header_conf == 'never': # Note: using ''.encode('ascii') sends a header with no value, # instead of no header at all - req.setRawHeader('Referer'.encode('ascii'), QByteArray()) + req.setRawHeader(b'Referer', QByteArray()) elif (referer_header_conf == 'same-domain' and not urlutils.same_domain(req.url(), current_url)): - req.setRawHeader('Referer'.encode('ascii'), QByteArray()) + req.setRawHeader(b'Referer', QByteArray()) # If refer_header_conf is set to 'always', we leave the header # alone as QtWebKit did set it. except urlutils.InvalidUrlError: diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py index 14ac6f395..5241ab4c3 100644 --- a/tests/end2end/conftest.py +++ b/tests/end2end/conftest.py @@ -55,8 +55,8 @@ def pytest_unconfigure(config): if config.getoption('--qute-profile-subprocs'): stats = pstats.Stats() for fn in pathlib.Path('prof').iterdir(): - stats.add((pathlib.Path('prof') / fn)) - stats.dump_stats((pathlib.Path('prof') / 'combined.pstats')) + stats.add(pathlib.Path('prof') / fn) + stats.dump_stats(pathlib.Path('prof') / 'combined.pstats') def _check_version(op_str, running_version, version_str, as_hex=False): diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py index b4964d973..6a4b249c2 100644 --- a/tests/end2end/fixtures/webserver_sub.py +++ b/tests/end2end/fixtures/webserver_sub.py @@ -231,7 +231,7 @@ def drip(): def generate_bytes(): for _ in range(numbytes): - yield "*".encode('utf-8') + yield b"*" time.sleep(pause) response = flask.Response(generate_bytes(), headers={ |