summaryrefslogtreecommitdiff
path: root/apt/debfile.py
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-12-19 13:35:59 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-12-19 13:35:59 +0100
commit375920c5172a5f60acba02b73c3b32ffbccc8ab2 (patch)
treea1d1aff85af6453640168030c9b2c772f714689f /apt/debfile.py
parent10ec8cd5b5614606b3db9fdc3d6e248984048f0e (diff)
downloadpython-apt-375920c5172a5f60acba02b73c3b32ffbccc8ab2.tar.gz
pyflakes cleanup, use apt_pkg.gettext in aptsources too
Diffstat (limited to 'apt/debfile.py')
-rw-r--r--apt/debfile.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/apt/debfile.py b/apt/debfile.py
index cd027c71..ab24c50b 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -160,10 +160,6 @@ class DebPackage(object):
def _satisfy_or_group(self, or_group):
"""Try to satisfy the or_group."""
-
- or_found = False
- virtual_pkg = None
-
for dep in or_group:
depname, ver, oper = dep
@@ -233,10 +229,6 @@ class DebPackage(object):
def _check_conflicts_or_group(self, or_group):
"""Check the or-group for conflicts with installed pkgs."""
self._dbg(2, "_check_conflicts_or_group(): %s " % (or_group))
-
- or_found = False
- virtual_pkg = None
-
for dep in or_group:
depname = dep[0]
ver = dep[1]
@@ -514,7 +506,7 @@ class DebPackage(object):
for pkg in self._need_pkgs:
try:
self._cache[pkg].mark_install(from_user=False)
- except SystemError as e:
+ except SystemError:
self._failure_string = _("Cannot install '%s'") % pkg
self._cache.clear()
return False
@@ -607,7 +599,7 @@ class DebPackage(object):
# auto-convert to hex
try:
data = unicode(data, "utf-8")
- except Exception as e:
+ except Exception:
new_data = _("Automatically converted to printable ascii:\n")
new_data += self.to_strish(data)
return new_data