use 'in' keyword to test dictionary membership

1 files changed, 8 insertions, 8 deletions

diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index 431180d4a..ea9ba1ca3 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -396,7 +396,7 @@ class system_info:
         self.saved_results[self.__class__.__name__] = info
 
     def has_info(self):
-        return self.saved_results.has_key(self.__class__.__name__)
+        return self.__class__.__name__ in self.saved_results
 
     def get_info(self,notfound_action=0):
         """ Return a dictonary with items that are compatible
@@ -441,13 +441,13 @@ class system_info:
             if is_sequence(env_var):
                 e0 = env_var[-1]
                 for e in env_var:
-                    if os.environ.has_key(e):
+                    if e in os.environ:
                         e0 = e
                         break
                 if not env_var[0]==e0:
                     log.info('Setting %s=%s' % (env_var[0],e0))
                 env_var = e0
-        if env_var and os.environ.has_key(env_var):
+        if env_var and env_var in os.environ:
             d = os.environ[env_var]
             if d=='None':
                 log.info('Disabled %s: %s',self.__class__.__name__,'(%s is None)' \
@@ -1146,7 +1146,7 @@ def get_atlas_version(**config):
     libraries = config.get('libraries', [])
     library_dirs = config.get('library_dirs', [])
     key = (tuple(libraries), tuple(library_dirs))
-    if _cached_atlas_version.has_key(key):
+    if key in _cached_atlas_version:
         return _cached_atlas_version[key]
     c = cmd_config(Distribution())
     atlas_version = None
@@ -1229,7 +1229,7 @@ class lapack_opt_info(system_info):
         if atlas_info:
             version_info = atlas_info.copy()
             atlas_version = get_atlas_version(**version_info)
-            if not atlas_info.has_key('define_macros'):
+            if 'define_macros' not in atlas_info:
                 atlas_info['define_macros'] = []
             if atlas_version is None:
                 atlas_info['define_macros'].append(('NO_ATLAS_INFO',2))
@@ -1328,7 +1328,7 @@ class blas_opt_info(system_info):
         if atlas_info:
             version_info = atlas_info.copy()
             atlas_version = get_atlas_version(**version_info)
-            if not atlas_info.has_key('define_macros'):
+            if 'define_macros' not in atlas_info:
                 atlas_info['define_macros'] = []
             if atlas_version is None:
                 atlas_info['define_macros'].append(('NO_ATLAS_INFO',2))
@@ -1657,7 +1657,7 @@ class _pkg_config_info(system_info):
     cflags_flag = '--cflags'
 
     def get_config_exe(self):
-        if os.environ.has_key(self.config_env_var):
+        if self.config_env_var in os.environ:
             return os.environ[self.config_env_var]
         return self.default_config_exe
     def get_config_output(self, config_exe, option):
@@ -1890,7 +1890,7 @@ def dict_append(d,**kws):
         if k=='language':
             languages.append(v)
             continue
-        if d.has_key(k):
+        if k in d:
             if k in ['library_dirs','include_dirs','define_macros']:
                 [d[k].append(vv) for vv in v if vv not in d[k]]
             else: