rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PyQIODevice: First attempt at fixing read().

Browse Source 
This was completely broken because one read overload doesn't exist in PyQt and
apparently it was never tested...
This commit is contained in:
Florian Bruhin 2015-05-25 20:43:28 +02:00
parent fa69786b0f
commit ba9c782824
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qutebrowser/utils/qtutils.py
View File

@ -311,13 +311,28 @@ class PyQIODevice(io.BufferedIOBase):
raise OSError(self._dev.errorString()) raise OSError(self._dev.errorString())
return num return num
def read(self, size): def read(self, size=-1):
self._check_open() self._check_open()
buf = bytes() self._check_readable()
num = self._dev.read(buf, size) if size == 0:
if num == -1: # Read no data
raise OSError(self._dev.errorString()) return b''
return num elif size < 0:
# Read all data
if self._dev.bytesAvailable() > 0:
buf = self._dev.readAll()
if not buf:
raise OSError(self._dev.errorString())
else:
return b''
else:
if self._dev.bytesAvailable() > 0:
buf = self._dev.read(size)
if not buf:
raise OSError(self._dev.errorString())
else:
return b''
return buf
class QtValueError(ValueError): class QtValueError(ValueError):