summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-07-07 22:55:26 +0000
committerZac Medico <zmedico@gentoo.org>2008-07-07 22:55:26 +0000
commit8ba83b5e9c0c94a1de753e41590db00294613cf3 (patch)
tree722bd3b29036a590fc4679e8f329f9837b3c2ac6
parent8c8226266a93b0b01790ad983b8f35259e4a7543 (diff)
downloadportage-8ba83b5e9c0c94a1de753e41590db00294613cf3.tar.gz
portage-8ba83b5e9c0c94a1de753e41590db00294613cf3.tar.bz2
portage-8ba83b5e9c0c94a1de753e41590db00294613cf3.zip
Rename SubProcess.reg_id to _reg_id since it no longer needs to be exposed.
svn path=/main/trunk/; revision=10975
-rw-r--r--pym/_emerge/__init__.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index bf4ef3afd..48e5ca6f2 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1660,7 +1660,8 @@ class TaskSequence(CompositeTask):
self.wait()
class SubProcess(AsynchronousTask):
- __slots__ = ("pid", "registered", "reg_id", "scheduler")
+
+ __slots__ = ("scheduler",) + ("pid", "registered", "_reg_id")
# A file descriptor is required for the scheduler to monitor changes from
# inside a poll() loop. When logging is not enabled, create a pipe just to
@@ -1691,7 +1692,7 @@ class SubProcess(AsynchronousTask):
def _wait(self):
if self.returncode is not None:
return self.returncode
- self.scheduler.schedule(self.reg_id)
+ self.scheduler.schedule(self._reg_id)
self._set_returncode(os.waitpid(self.pid, 0))
return self.returncode
@@ -1790,7 +1791,7 @@ class SpawnProcess(SubProcess):
os.close(slave_fd)
files.process = os.fdopen(master_fd, 'r')
- self.reg_id = self.scheduler.register(files.process.fileno(),
+ self._reg_id = self.scheduler.register(files.process.fileno(),
PollConstants.POLLIN, output_handler)
self.registered = True
@@ -2269,7 +2270,7 @@ class EbuildPhase(SubProcess):
os.close(slave_fd)
files.ebuild = os.fdopen(master_fd, 'r')
- self.reg_id = self.scheduler.register(files.ebuild.fileno(),
+ self._reg_id = self.scheduler.register(files.ebuild.fileno(),
PollConstants.POLLIN, output_handler)
self.registered = True