use 'in' keyword to test dictionary membership

1 files changed, 7 insertions, 7 deletions

diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index d49a3ba14..79fdd46ec 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -230,7 +230,7 @@ def make_temp_file(suffix='', prefix='', text=True):
 # Hooks for colored terminal output.
 # See also http://www.livinglogic.de/Python/ansistyle
 def terminal_has_colors():
-    if sys.platform=='cygwin' and not os.environ.has_key('USE_COLOR'):
+    if sys.platform=='cygwin' and 'USE_COLOR' not in os.environ:
         # Avoid importing curses that causes illegal operation
         # with a message:
         #  PYTHON2 caused an invalid page fault in
@@ -323,7 +323,7 @@ def msvc_on_amd64():
         return
     if get_build_architecture() != 'AMD64':
         return
-    if os.environ.has_key('DISTUTILS_USE_SDK'):
+    if 'DISTUTILS_USE_SDK' in os.environ:
         return
     # try to avoid _MSVCCompiler__root attribute error
     print 'Forcing DISTUTILS_USE_SDK=1'
@@ -704,7 +704,7 @@ class Configuration(object):
         - quiet
         """
         for key, value in options.items():
-            if self.options.has_key(key):
+            if key in self.options:
                 self.options[key] = value
             else:
                 raise ValueError,'Unknown option: '+key
@@ -934,7 +934,7 @@ class Configuration(object):
     def _optimize_data_files(self):
         data_dict = {}
         for p,files in self.data_files:
-            if not data_dict.has_key(p):
+            if p not in data_dict:
                 data_dict[p] = set()
             map(data_dict[p].add,files)
         self.data_files[:] = [(p,list(files)) for p,files in data_dict.items()]
@@ -1092,7 +1092,7 @@ class Configuration(object):
         ext_args['name'] = dot_join(self.name,name)
         ext_args['sources'] = sources
 
-        if ext_args.has_key('extra_info'):
+        if 'extra_info' in ext_args:
             extra_info = ext_args['extra_info']
             del ext_args['extra_info']
             if isinstance(extra_info, dict):
@@ -1405,7 +1405,7 @@ class Configuration(object):
 
 
 def get_cmd(cmdname, _cache={}):
-    if not _cache.has_key(cmdname):
+    if cmdname not in _cache:
         import distutils.core
         dist = distutils.core._setup_distribution
         if dist is None:
@@ -1443,7 +1443,7 @@ def default_config_dict(name = None, parent_name = None, local_path=None):
 
 def dict_append(d, **kws):
     for k, v in kws.items():
-        if d.has_key(k):
+        if k in d:
             ov = d[k]
             if isinstance(ov,str):
                 d[k] = v