From ab0507d7d7baccef0960cd1d60d837e39f3161e3 Mon Sep 17 00:00:00 2001
From: Mats Wichmann <mats@linux.com>
Date: Wed, 10 Mar 2021 10:14:16 -0700
Subject: 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>
---
 CHANGES.txt                       |  2 ++
 SCons/ActionTests.py              |  4 ++--
 SCons/BuilderTests.py             |  6 ++----
 SCons/Environment.py              | 22 ++++------------------
 SCons/EnvironmentTests.py         | 23 ++---------------------
 SCons/Scanner/FortranTests.py     |  2 +-
 SCons/Scanner/IDLTests.py         |  2 +-
 SCons/Scanner/ProgTests.py        |  2 +-
 SCons/Scanner/RCTests.py          |  4 ++--
 SCons/Script/SConsOptions.py      |  5 ++++-
 SCons/Tool/FortranCommonTests.py  |  2 +-
 SCons/Tool/ToolTests.py           |  4 ++--
 SCons/Tool/msvsTests.py           |  3 ---
 SCons/Util.py                     | 13 ++++++-------
 SCons/Variables/VariablesTests.py |  4 ----
 SCons/dblite.py                   |  3 ---
 16 files changed, 30 insertions(+), 71 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ed5ece8..03d563d 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -32,6 +32,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Add timing information for sconsign database dump when --debug=time
       is selected. Also switch to generally using time.perf_counter,
       which is the Python recommended way for timing short durations.
+    - Drop remaining definitions of dict-like has_key methods, since
+      Python 3 doesn't have a dictionary has_key (maintenance)
 
 
 RELEASE 4.1.0 - Tues, 19 Jan 2021 15:04:42 -0700
diff --git a/SCons/ActionTests.py b/SCons/ActionTests.py
index e665472..dff7e0c 100644
--- a/SCons/ActionTests.py
+++ b/SCons/ActionTests.py
@@ -157,8 +157,8 @@ class Environment:
     def __setitem__(self, item, value):
         self.d[item] = value
 
-    def has_key(self, item):
-        return item in self.d
+    def __contains__(self, key):
+        return key in self.d
 
     def get(self, key, value=None):
         return self.d.get(key, value)
diff --git a/SCons/BuilderTests.py b/SCons/BuilderTests.py
index 8d616f1..9828ef7 100644
--- a/SCons/BuilderTests.py
+++ b/SCons/BuilderTests.py
@@ -118,10 +118,8 @@ class Environment:
         self.d[item] = var
     def __getitem__(self, item):
         return self.d[item]
-    def __contains__(self, item):
-        return self.d.__contains__(item)
-    def has_key(self, item):
-        return item in self.d
+    def __contains__(self, key):
+        return key in self.d
     def keys(self):
         return list(self.d.keys())
     def get(self, key, value=None):
diff --git a/SCons/Environment.py b/SCons/Environment.py
index 902d8f7..aca44f7 100644
--- a/SCons/Environment.py
+++ b/SCons/Environment.py
@@ -369,8 +369,7 @@ class SubstitutionEnvironment:
         self._special_set['SCANNERS'] = _set_SCANNERS
 
         # Freeze the keys of self._special_set in a list for use by
-        # methods that need to check.  (Empirically, list scanning has
-        # gotten better than dict.has_key() in Python 2.5.)
+        # methods that need to check.
         self._special_set_keys = list(self._special_set.keys())
 
     def __eq__(self, other):
@@ -392,10 +391,9 @@ class SubstitutionEnvironment:
         #
         # The "key in self._special_set_keys" test here seems to perform
         # pretty well for the number of keys we have.  A hard-coded
-        # list works a little better in Python 2.5, but that has the
+        # list worked a little better in Python 2.5, but that has the
         # disadvantage of maybe getting out of sync if we ever add more
-        # variable names.  Using self._special_set.has_key() works a
-        # little better in Python 2.4, but is worse than this test.
+        # variable names.
         # So right now it seems like a good trade-off, but feel free to
         # revisit this with bench/env.__setitem__.py as needed (and
         # as newer versions of Python come out).
@@ -414,10 +412,6 @@ class SubstitutionEnvironment:
         """Emulates the get() method of dictionaries."""
         return self._dict.get(key, default)
 
-    def has_key(self, key):
-        """Emulates the has_key() method of dictionaries."""
-        return key in self._dict
-
     def __contains__(self, key):
         return self._dict.__contains__(key)
 
@@ -2416,17 +2410,9 @@ class OverrideEnvironment(Base):
         except KeyError:
             return self.__dict__['__subject'].get(key, default)
 
-    def has_key(self, key):
-        """Emulates the has_key() method of dictionaries."""
-        try:
-            self.__dict__['overrides'][key]
-            return 1
-        except KeyError:
-            return key in self.__dict__['__subject']
-
     def __contains__(self, key):
         if self.__dict__['overrides'].__contains__(key):
-            return 1
+            return True
         return self.__dict__['__subject'].__contains__(key)
 
     def Dictionary(self, *args):
diff --git a/SCons/EnvironmentTests.py b/SCons/EnvironmentTests.py
index a67ed83..c2d5087 100644
--- a/SCons/EnvironmentTests.py
+++ b/SCons/EnvironmentTests.py
@@ -219,12 +219,6 @@ class SubstitutionTestCase(unittest.TestCase):
         assert env.get('XXX') == 'x', env.get('XXX')
         assert env.get('YYY') is None, env.get('YYY')
 
-    def test_has_key(self):
-        """Test the SubstitutionEnvironment has_key() method."""
-        env = SubstitutionEnvironment(XXX = 'x')
-        assert 'XXX' in env
-        assert 'YYY' not in env
-
     def test_contains(self):
         """Test the SubstitutionEnvironment __contains__() method."""
         env = SubstitutionEnvironment(XXX = 'x')
@@ -3632,8 +3626,8 @@ class OverrideEnvironmentTestCase(unittest.TestCase,TestEnvironmentFixture):
         assert env2.get('ZZZ') is None, env2.get('ZZZ')
         assert env3.get('ZZZ') == 'z3', env3.get('ZZZ')
 
-    def test_has_key(self):
-        """Test the OverrideEnvironment has_key() method"""
+    def test_contains(self):
+        """Test the OverrideEnvironment __contains__() method"""
         env, env2, env3 = self.envs
         assert 'XXX' in env, 'XXX' in env
         assert 'XXX' in env2, 'XXX' in env2
@@ -3645,19 +3639,6 @@ class OverrideEnvironmentTestCase(unittest.TestCase,TestEnvironmentFixture):
         assert 'ZZZ' not in env2, 'ZZZ' in env2
         assert 'ZZZ' in env3, 'ZZZ' in env3
 
-    def test_contains(self):
-        """Test the OverrideEnvironment __contains__() method"""
-        env, env2, env3 = self.envs
-        assert 'XXX' in env
-        assert 'XXX' in env2
-        assert 'XXX' in env3
-        assert 'YYY' in env
-        assert 'YYY' in env2
-        assert 'YYY' in env3
-        assert 'ZZZ' not in env
-        assert 'ZZZ' not in env2
-        assert 'ZZZ' in env3
-
     def test_Dictionary(self):
         """Test the OverrideEnvironment Dictionary() method"""
         env, env2, env3 = self.envs
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
diff --git a/SCons/Script/SConsOptions.py b/SCons/Script/SConsOptions.py
index 8d45cf5..02e3b2c 100644
--- a/SCons/Script/SConsOptions.py
+++ b/SCons/Script/SConsOptions.py
@@ -227,7 +227,10 @@ class SConsOption(optparse.Option):
             fmt = "option %s: nargs='?' is incompatible with short options"
             raise SCons.Errors.UserError(fmt % self._short_opts[0])
 
-    CHECK_METHODS = optparse.Option.CHECK_METHODS + [_check_nargs_optional]
+    CHECK_METHODS = optparse.Option.CHECK_METHODS
+    if CHECK_METHODS is None:
+        CHECK_METHODS = []
+    CHECK_METHODS += [_check_nargs_optional]
     CONST_ACTIONS = optparse.Option.CONST_ACTIONS + optparse.Option.TYPED_ACTIONS
 
 class SConsOptionGroup(optparse.OptionGroup):
diff --git a/SCons/Tool/FortranCommonTests.py b/SCons/Tool/FortranCommonTests.py
index b050e26..56f41c7 100644
--- a/SCons/Tool/FortranCommonTests.py
+++ b/SCons/Tool/FortranCommonTests.py
@@ -49,7 +49,7 @@ class DummyEnvironment:
         self.fs = SCons.Node.FS.FS(test.workpath(''))
         self.dictionary = {}
 
-    def has_key(self, key):
+    def __contains__(self, key):
         return key in self.dictionary
 
     def __getitem__(self, key):
diff --git a/SCons/Tool/ToolTests.py b/SCons/Tool/ToolTests.py
index 9a6d9b5..32ec5c4 100644
--- a/SCons/Tool/ToolTests.py
+++ b/SCons/Tool/ToolTests.py
@@ -46,8 +46,8 @@ class DummyEnvironment:
     def __setitem__(self, key, val):
         self.dict[key] = val
     def __contains__(self, key):
-        return self.dict.__contains__(key)
-    def has_key(self, key):
+        return key in self.dict
+    def __contains__(self, key):
         return key in self.dict
     def subst(self, string, *args, **kwargs):
         return string
diff --git a/SCons/Tool/msvsTests.py b/SCons/Tool/msvsTests.py
index 336c6f9..4cbaf0e 100644
--- a/SCons/Tool/msvsTests.py
+++ b/SCons/Tool/msvsTests.py
@@ -412,9 +412,6 @@ class DummyEnv:
     def __contains__(self, key):
         return key in self.dict
 
-    def has_key(self, name):
-        return name in self.dict
-
     def get(self, name, value=None):
         if name in self.dict:
             return self.dict[name]
diff --git a/SCons/Util.py b/SCons/Util.py
index 4dd70f7..5a89704 100644
--- a/SCons/Util.py
+++ b/SCons/Util.py
@@ -1216,14 +1216,13 @@ def uniquer(seq, idfun=None):
         idfun = default_idfun
     seen = {}
     result = []
+    result_append = result.append
     for item in seq:
         marker = idfun(item)
-        # in old Python versions:
-        # if seen.has_key(marker)
-        # but in new ones:
-        if marker in seen: continue
+        if marker in seen:
+            continue
         seen[marker] = 1
-        result.append(item)
+        result_append(item)
     return result
 
 # A more efficient implementation of Alex's uniquer(), this avoids the
@@ -1233,11 +1232,11 @@ def uniquer(seq, idfun=None):
 def uniquer_hashables(seq):
     seen = {}
     result = []
+    result_append = result.append
     for item in seq:
-        #if not item in seen:
         if item not in seen:
             seen[item] = 1
-            result.append(item)
+            result_append(item)
     return result
 
 
diff --git a/SCons/Variables/VariablesTests.py b/SCons/Variables/VariablesTests.py
index 768f88e..8def19e 100644
--- a/SCons/Variables/VariablesTests.py
+++ b/SCons/Variables/VariablesTests.py
@@ -41,13 +41,9 @@ class Environment:
     def __getitem__(self, key):
         return self.dict[key]
     def __contains__(self, key):
-        return self.dict.__contains__(key)
-    def has_key(self, key):
         return key in self.dict
 
 
-
-
 def check(key, value, env):
     assert int(value) == 6 * 9, "key %s = %s" % (key, repr(value))
     
diff --git a/SCons/dblite.py b/SCons/dblite.py
index a5186ca..9cf975c 100644
--- a/SCons/dblite.py
+++ b/SCons/dblite.py
@@ -197,9 +197,6 @@ class dblite:
     def keys(self):
         return list(self._dict.keys())
 
-    def has_key(self, key):
-        return key in self._dict
-
     def __contains__(self, key):
         return key in self._dict
 
-- 
cgit v0.12