Mercurial > cpython-lru_cache-weakref

diff Lib/distutils/util.py @ 39575:63237fcefd99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of dict.has_key(). Boy this has a lot of repercussions! Not all code has been fixed yet; this is just a checkpoint... The C API still has PyDict_HasKey() and _HasKeyString(); not sure if I want to change those just yet.
author Guido van Rossum <guido@python.org>
date Fri, 18 Aug 2006 22:13:04 +0000
parents 29ae5e0fc348
children 6b18a095c2e7
line wrap: on
line diff
--- a/Lib/distutils/util.py	Fri Aug 18 16:29:54 2006 +0000
+++ b/Lib/distutils/util.py	Fri Aug 18 22:13:04 2006 +0000
@@ -200,11 +200,11 @@
     if _environ_checked:
         return
 
-    if os.name == 'posix' and not os.environ.has_key('HOME'):
+    if os.name == 'posix' and 'HOME' not in os.environ:
         import pwd
         os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
 
-    if not os.environ.has_key('PLAT'):
+    if 'PLAT' not in os.environ:
         os.environ['PLAT'] = get_platform()
 
     _environ_checked = 1
@@ -222,7 +222,7 @@
     check_environ()
     def _subst (match, local_vars=local_vars):
         var_name = match.group(1)
-        if local_vars.has_key(var_name):
+        if var_name in local_vars:
             return str(local_vars[var_name])
         else:
             return os.environ[var_name]