Drop dictionary has_key references: Py2-ism.

In some cases, added a __contains__ method instead,
not because it necessarily was needed, but for completeness.

Also one completely unrelated change because it happened to
be sitting modified in the tree when I committed modified files:
be a little more cautious about building CHECK_METHODS in
our subclassing of the optparse Option class... current
cpython starts it at None, then fills it in, so it shouldn't
be None when we subclass.

Signed-off-by: Mats Wichmann <mats@linux.com>

4 files changed, 5 insertions, 5 deletions

diff --git a/SCons/Scanner/FortranTests.py b/SCons/Scanner/FortranTests.py
index 487fb7b..729e91a 100644
--- a/SCons/Scanner/FortranTests.py
+++ b/SCons/Scanner/FortranTests.py
@@ -214,7 +214,7 @@ class DummyEnvironment:
         else:
             raise KeyError("Dummy environment only has FORTRANPATH attribute.")
 
-    def has_key(self, key):
+    def __contains__(self, key):
         return key in self.Dictionary()
 
     def __getitem__(self, key):
diff --git a/SCons/Scanner/IDLTests.py b/SCons/Scanner/IDLTests.py
index fc1d1c8..28433d1 100644
--- a/SCons/Scanner/IDLTests.py
+++ b/SCons/Scanner/IDLTests.py
@@ -207,7 +207,7 @@ class DummyEnvironment:
             path = [path]
         return list(map(self.subst, path))
 
-    def has_key(self, key):
+    def __contains__(self, key):
         return key in self.Dictionary()
 
     def __getitem__(self,key):
diff --git a/SCons/Scanner/ProgTests.py b/SCons/Scanner/ProgTests.py
index 4b17d9b..5aa0571 100644
--- a/SCons/Scanner/ProgTests.py
+++ b/SCons/Scanner/ProgTests.py
@@ -57,7 +57,7 @@ class DummyEnvironment:
         else:
             return [self._dict[x] for x in args]
 
-    def has_key(self, key):
+    def __contains__(self, key):
         return key in self.Dictionary()
 
     def __getitem__(self,key):
diff --git a/SCons/Scanner/RCTests.py b/SCons/Scanner/RCTests.py
index 9183ec7..8835e5f 100644
--- a/SCons/Scanner/RCTests.py
+++ b/SCons/Scanner/RCTests.py
@@ -89,8 +89,8 @@ class DummyEnvironment(collections.UserDict):
             path = [path]
         return list(map(self.subst, path))
 
-    def has_key(self, key):
-        return key in self.Dictionary()
+    def __contains__(self, key):
+        return key in self.data
 
     def get_calculator(self):
         return None