[python-debian/master 08/36] Use "key in dict" rather than obsolete "dict.has_key(key)".

[Colin Watson]

---
 examples/deb822/grep-maintainer |    2 +-
 examples/debtags/tagminer       |    4 ++--
 tests/test_deb822.py            |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/deb822/grep-maintainer b/examples/deb822/grep-maintainer
index 358bf7e..2775dda 100755
--- a/examples/deb822/grep-maintainer
+++ b/examples/deb822/grep-maintainer
@@ -26,6 +26,6 @@ except re.error as e:
     sys.exit(1)
 
 for pkg in deb822.Packages.iter_paragraphs(file('/var/lib/dpkg/status')):
-    if pkg.has_key('Maintainer') and maint_RE.search(pkg['maintainer']):
+    if 'Maintainer' in pkg and maint_RE.search(pkg['maintainer']):
         print(pkg['package'])
 
diff --git a/examples/debtags/tagminer b/examples/debtags/tagminer
index d5c2e97..ade8be6 100755
--- a/examples/debtags/tagminer
+++ b/examples/debtags/tagminer
@@ -91,13 +91,13 @@ def mimetype(fname):
     keys = extractor.extract(fname)
     xkeys = {}
     for k, v in keys:
-        if xkeys.has_key(k):
+        if k in xkeys:
             xkeys[k].append(v)
         else:
             xkeys[k] = [v]
     namemagic =  magic.file(fname)
     contentmagic = magic.buffer(file(fname, "r").read(4096))
-    return xkeys.has_key("mimetype") and xkeys['mimetype'][0] or contentmagic or namemagic
+    return "mimetype" in xkeys and xkeys['mimetype'][0] or contentmagic or namemagic
 
 
 class Parser(OptionParser):
diff --git a/tests/test_deb822.py b/tests/test_deb822.py
index 93d6af3..1b5c665 100755
--- a/tests/test_deb822.py
+++ b/tests/test_deb822.py
@@ -673,7 +673,7 @@ Description: python modules to work with Debian-related data formats
         self.assertEqual(input2, d2.dump())
 
         d3 = deb822.Deb822()
-        if not d3.has_key('some-test-key'):
+        if 'some-test-key' not in d3:
             d3['Some-Test-Key'] = 'some value'
         self.assertEqual(d3.dump(), "Some-Test-Key: some value\n")
 
-- 
1.7.2.5