summaryrefslogtreecommitdiff
path: root/apt/debfile.py
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-01-10 18:08:13 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-01-10 18:08:13 +0100
commit660c5bbf9d2793a392572e1c23eb36b4e9298792 (patch)
treea74476633321630911690e7f513869efe5026132 /apt/debfile.py
parentb221e38a33871bc7040e457051c38ef222e618e5 (diff)
downloadpython-apt-660c5bbf9d2793a392572e1c23eb36b4e9298792.tar.gz
merged lp:~geser/ubuntu/natty/python-apt/build-with-py3.2 (manually as bzr thinks the branches have nothing in common)
Diffstat (limited to 'apt/debfile.py')
-rw-r--r--apt/debfile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt/debfile.py b/apt/debfile.py
index 996a4cb3..86fd221b 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -461,7 +461,7 @@ class DebPackage(object):
for pkg in self._need_pkgs:
try:
self._cache[pkg].mark_install(from_user=False)
- except SystemError, e:
+ except SystemError as e:
self._failure_string = _("Cannot install '%s'") % pkg
self._cache.clear()
return False
@@ -543,7 +543,7 @@ class DebPackage(object):
# auto-convert to hex
try:
data = unicode(data, "utf-8")
- except Exception, e:
+ except Exception as e:
new_data = _("Automatically converted to printable ascii:\n")
new_data += self.to_strish(data)
return new_data