From 1712603dce765698d33dce7f60675c75fed3b4df Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Thu, 3 Jan 2013 23:28:07 +0100
Subject: [PATCH] Replacing deprecated has_key() with operator in (PEP8)

---
 extra/sqlharvest/sqlharvest.py     | 2 +-
 lib/core/convert.py                | 4 ++--
 lib/core/datatype.py               | 4 ++--
 plugins/dbms/maxdb/enumeration.py  | 2 +-
 plugins/dbms/sybase/enumeration.py | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extra/sqlharvest/sqlharvest.py b/extra/sqlharvest/sqlharvest.py
index 8a752e111..1c3f3188a 100644
--- a/extra/sqlharvest/sqlharvest.py
+++ b/extra/sqlharvest/sqlharvest.py
@@ -92,7 +92,7 @@ def main():
                     req = urllib2.Request(sqlfile)
                     response = urllib2.urlopen(req)
 
-                    if response.headers.has_key("Content-Length"):
+                    if "Content-Length" in response.headers:
                         if int(response.headers.get("Content-Length")) > MAX_FILE_SIZE:
                             continue
 
diff --git a/lib/core/convert.py b/lib/core/convert.py
index 852347d1c..ae1b1f201 100644
--- a/lib/core/convert.py
+++ b/lib/core/convert.py
@@ -47,7 +47,7 @@ def hexencode(value):
     return utf8encode(value).encode("hex")
 
 def md5hash(value):
-    if sys.modules.has_key('hashlib'):
+    if "hashlib" in sys.modules:
         return hashlib.md5(value).hexdigest()
     else:
         return md5.new(value).hexdigest()
@@ -60,7 +60,7 @@ def ordencode(value):
     return tuple(ord(char) for char in value)
 
 def sha1hash(value):
-    if sys.modules.has_key('hashlib'):
+    if "hashlib" in sys.modules:
         return hashlib.sha1(value).hexdigest()
     else:
         return sha.new(value).hexdigest()
diff --git a/lib/core/datatype.py b/lib/core/datatype.py
index 032176027..1d0ddc9f4 100644
--- a/lib/core/datatype.py
+++ b/lib/core/datatype.py
@@ -47,11 +47,11 @@ class AttribDict(dict):
         """
 
         # This test allows attributes to be set in the __init__ method
-        if not self.__dict__.has_key('_AttribDict__initialised'):
+        if "_AttribDict__initialised" not in self.__dict__:
             return dict.__setattr__(self, item, value)
 
         # Any normal attributes are handled normally
-        elif self.__dict__.has_key(item):
+        elif item in self.__dict__:
             dict.__setattr__(self, item, value)
 
         else:
diff --git a/plugins/dbms/maxdb/enumeration.py b/plugins/dbms/maxdb/enumeration.py
index b17675dd3..f1760de1d 100644
--- a/plugins/dbms/maxdb/enumeration.py
+++ b/plugins/dbms/maxdb/enumeration.py
@@ -81,7 +81,7 @@ class Enumeration(GenericEnumeration):
 
             if retVal:
                 for table in retVal[0].values()[0]:
-                    if not kb.data.cachedTables.has_key(db):
+                    if db not in kb.data.cachedTables:
                         kb.data.cachedTables[db] = [table]
                     else:
                         kb.data.cachedTables[db].append(table)
diff --git a/plugins/dbms/sybase/enumeration.py b/plugins/dbms/sybase/enumeration.py
index 4ead48e7c..f7fb794b6 100644
--- a/plugins/dbms/sybase/enumeration.py
+++ b/plugins/dbms/sybase/enumeration.py
@@ -145,7 +145,7 @@ class Enumeration(GenericEnumeration):
 
                 if retVal:
                     for table in retVal[0].values()[0]:
-                        if not kb.data.cachedTables.has_key(db):
+                        if db not in kb.data.cachedTables:
                             kb.data.cachedTables[db] = [table]
                         else:
                             kb.data.cachedTables[db].append(table)