summaryrefslogtreecommitdiff
path: root/apt/progress/base.py
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2011-02-18 22:37:34 +0100
committerMichael Vogt <mvo@debian.org>2011-02-18 22:37:34 +0100
commitbe46a92a5621d2c199792ead5371afb979f32f9c (patch)
tree3d4397fc802685b433b1f72cf7067907c4a6540f /apt/progress/base.py
parent45100d466f6c392758ff2e490cdfee9aae7e55a7 (diff)
parent2885341cf3d7a1050be1bf2a45237395a3149feb (diff)
downloadpython-apt-be46a92a5621d2c199792ead5371afb979f32f9c.tar.gz
merged from lp:~mvo/python-apt/mvo
Diffstat (limited to 'apt/progress/base.py')
-rw-r--r--apt/progress/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/apt/progress/base.py b/apt/progress/base.py
index 6822b74a..97375431 100644
--- a/apt/progress/base.py
+++ b/apt/progress/base.py
@@ -211,7 +211,7 @@ class InstallProgress(object):
"""Update the interface."""
try:
line = self.status_stream.readline()
- except IOError, err:
+ except IOError as err:
# resource temporarly unavailable is ignored
if err.errno != errno.EAGAIN and err.errno != errno.EWOULDBLOCK:
print err.strerror
@@ -266,7 +266,7 @@ class InstallProgress(object):
try:
select.select([self.status_stream], [], [],
self.select_timeout)
- except select.error, (errno_, _errstr):
+ except select.error as (errno_, _errstr):
if errno_ != errno.EINTR:
raise
@@ -275,7 +275,7 @@ class InstallProgress(object):
(pid, res) = os.waitpid(self.child_pid, os.WNOHANG)
if pid == self.child_pid:
break
- except OSError, err:
+ except OSError as err:
if err.errno == errno.ECHILD:
break
if err.errno != errno.EINTR: