From 11961db72c0591d8ad6e5e5be1ce277d98d54b43 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 29 Sep 2015 08:41:20 +0200 Subject: [PATCH] Add maxlen argument to ErrorNetworkReply.readData. This was missing before, causing a (hidden) exception with Python < 3.5, and this with 3.5: TypeError: readData() takes 1 positional argument but 2 were given During handling of the above exception, another exception occurred: SystemError: PyEval_EvalFrameEx returned a result with an error set Fixes #969. --- qutebrowser/browser/network/networkreply.py | 2 +- tests/unit/browser/network/test_networkreply.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/network/networkreply.py b/qutebrowser/browser/network/networkreply.py index 380767ea5..9205b655a 100644 --- a/qutebrowser/browser/network/networkreply.py +++ b/qutebrowser/browser/network/networkreply.py @@ -127,7 +127,7 @@ class ErrorNetworkReply(QNetworkReply): """We always have 0 bytes available.""" return 0 - def readData(self): + def readData(self, _maxlen): """No data available.""" return bytes() diff --git a/tests/unit/browser/network/test_networkreply.py b/tests/unit/browser/network/test_networkreply.py index c7e11907d..d526cf2f6 100644 --- a/tests/unit/browser/network/test_networkreply.py +++ b/tests/unit/browser/network/test_networkreply.py @@ -88,6 +88,6 @@ def test_error_network_reply(qtbot, req): assert reply.isFinished() assert not reply.isRunning() assert reply.bytesAvailable() == 0 - assert reply.readData() == b'' + assert reply.readData(1) == b'' assert reply.error() == QNetworkReply.UnknownNetworkError assert reply.errorString() == "This is an error"