commit: 8b3dd3537a2c50035d6369946e65305d448d7f1b
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 19:11:52 2018 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 19:25:20 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8b3dd353
AbstractPollTask: remove deprecated _read_* event parameter
Fixes: c11a6ec05f02 ("AbstractPollTask: add_reader asyncio compat (bug 654382)")
pym/_emerge/AbstractPollTask.py | 6 ++----
pym/_emerge/AsynchronousLock.py | 2 +-
pym/_emerge/EbuildIpcDaemon.py | 2 +-
pym/_emerge/EbuildMetadataPhase.py | 2 +-
pym/_emerge/PipeReader.py | 4 ++--
pym/portage/dbapi/_MergeProcess.py | 2 +-
pym/portage/util/_async/PipeLogger.py | 2 +-
7 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index f68cd3a15..6cccb27d9 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/pym/_emerge/AbstractPollTask.py
@@ -19,7 +19,7 @@ class AbstractPollTask(AsynchronousTask):
def isAlive(self):
return bool(self._registered)
- def _read_array(self, f, event):
+ def _read_array(self, f):
"""
NOTE: array.fromfile() is used here only for testing purposes,
because it has bugs in all known versions of Python (including
@@ -65,7 +65,7 @@ class AbstractPollTask(AsynchronousTask):
return buf
- def _read_buf(self, fd, event):
+ def _read_buf(self, fd):
"""
Read self._bufsize into a string of bytes, handling EAGAIN and
EIO. This will only call os.read() once, so the caller should
@@ -78,8 +78,6 @@ class AbstractPollTask(AsynchronousTask):
@param fd: file descriptor (non-blocking mode required)
@type fd: int
- @param event: poll event flags
- @type event: int
@rtype: bytes or None
@return: A string of bytes, or None
"""
diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLock.py
index 6cf37369f..aed1bcb15 100644
--- a/pym/_emerge/AsynchronousLock.py
+++ b/pym/_emerge/AsynchronousLock.py
@@ -266,7 +266,7 @@ class _LockProcess(AbstractPollTask):
return self.returncode
def _output_handler(self):
- buf = self._read_buf(self._files['pipe_in'], None)
+ buf = self._read_buf(self._files['pipe_in'])
if buf:
self._acquired = True
self._unregister()
diff --git a/pym/_emerge/EbuildIpcDaemon.py b/pym/_emerge/EbuildIpcDaemon.py
index c16049ee4..d0dbe18bd 100644
--- a/pym/_emerge/EbuildIpcDaemon.py
+++ b/pym/_emerge/EbuildIpcDaemon.py
@@ -34,7 +34,7 @@ class EbuildIpcDaemon(FifoIpcDaemon):
def _input_handler(self):
# Read the whole pickle in a single atomic read() call.
- data = self._read_buf(self._files.pipe_in, None)
+ data = self._read_buf(self._files.pipe_in)
if data is None:
pass # EAGAIN
elif data:
diff --git a/pym/_emerge/EbuildMetadataPhase.py
b/pym/_emerge/EbuildMetadataPhase.py
index 42bcd6739..4940d40b6 100644
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/pym/_emerge/EbuildMetadataPhase.py
@@ -130,7 +130,7 @@ class EbuildMetadataPhase(SubProcess):
def _output_handler(self):
while True:
- buf = self._read_buf(self._files.ebuild, None)
+ buf = self._read_buf(self._files.ebuild)
if buf is None:
break # EAGAIN
elif buf:
diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index 6a3fc9ea6..151be94ea 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -61,7 +61,7 @@ class PipeReader(AbstractPollTask):
def _output_handler(self, fd):
while True:
- data = self._read_buf(fd, None)
+ data = self._read_buf(fd)
if data is None:
break
if data:
@@ -79,7 +79,7 @@ class PipeReader(AbstractPollTask):
break
while True:
- data = self._read_array(f, None)
+ data = self._read_array(f)
if data is None:
break
if data:
diff --git a/pym/portage/dbapi/_MergeProcess.py
b/pym/portage/dbapi/_MergeProcess.py
index 42f2d84e5..fefdf8635 100644
--- a/pym/portage/dbapi/_MergeProcess.py
+++ b/pym/portage/dbapi/_MergeProcess.py
@@ -79,7 +79,7 @@ class MergeProcess(ForkProcess):
self._locked_vdb = False
def _elog_output_handler(self):
- output = self._read_buf(self._elog_reader_fd, None)
+ output = self._read_buf(self._elog_reader_fd)
if output:
lines = _unicode_decode(output).split('\n')
if len(lines) == 1:
diff --git a/pym/portage/util/_async/PipeLogger.py
b/pym/portage/util/_async/PipeLogger.py
index 61000271d..a4258f350 100644
--- a/pym/portage/util/_async/PipeLogger.py
+++ b/pym/portage/util/_async/PipeLogger.py
@@ -72,7 +72,7 @@ class PipeLogger(AbstractPollTask):
log_file = self._log_file
while True:
- buf = self._read_buf(fd, None)
+ buf = self._read_buf(fd)
if buf is None:
# not a POLLIN event, EAGAIN, etc...
