diff options
author | Guido van Rossum <guido@python.org> | 2006-08-18 22:13:04 +0000 |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2006-08-18 22:13:04 +0000 |
commit | da8deac8fe243659252fcfc54e2eb27370338c4e (patch) | |
tree | 25dccc64095a702a2a3e385072c704fcbe82ead4 /Lib/distutils/util.py | |
parent | aa155f550a0dc9f026f25e959671317991aa2179 (diff) | |
download | cpython-da8deac8fe243659252fcfc54e2eb27370338c4e.tar.gz |
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.
Diffstat (limited to 'Lib/distutils/util.py')
-rw-r--r-- | Lib/distutils/util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 1265f4c4e3..1bcda93fe0 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -200,11 +200,11 @@ def check_environ (): 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 @@ def subst_vars (s, local_vars): 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] |