From 75676866d4bf394b3ba1ddef06e0c93f6da03242 Mon Sep 17 00:00:00 2001 From: Ben Finney Date: Fri, 8 Aug 2008 10:27:33 +1000 Subject: 'mapping.has_key' is deprecated, use current Python 'key in mapping' idiom. --- apt/package.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'apt/package.py') diff --git a/apt/package.py b/apt/package.py index 7f060b04..445b36ad 100644 --- a/apt/package.py +++ b/apt/package.py @@ -66,8 +66,8 @@ class Record(object): raise KeyError return k - def has_key(self, key): - return self._rec.has_key(key) + def __contains__(self, key): + return (key in self._rec) class Package(object): @@ -146,7 +146,7 @@ class Package(object): depends_list = [] depends = ver.DependsList for t in ["PreDepends", "Depends"]: - if not depends.has_key(t): + if t not in depends: continue for depVerList in depends[t]: base_deps = [] @@ -178,9 +178,7 @@ class Package(object): if not self._lookupRecord(): return None sec = apt_pkg.ParseSection(self._records.Record) - if sec.has_key("Architecture"): - return sec["Architecture"] - return None + return sec.get("Architecture", None) architecture = property(architecture) def _downloadable(self, useCandidate=True): -- cgit v1.2.3