mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 04:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Removed uses of dict.has_key() from distutils, and uses of

Browse source 
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given.  More work like this needs to
be done in the rest of the stdlib.
This commit is contained in:
Guido van Rossum 2008-02-21 18:18:37 +00:00
parent b5e2684a1a
commit 8bc0965adf
17 changed files with 44 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/util.py
View file

@ -219,11 +219,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
@ -241,7 +241,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]