1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run 2to3's fix_has_key over Lib/plat-os2emx/.

Browse Source
This commit is contained in:
Collin Winter 2007-09-01 20:35:04 +00:00
parent ba21f618a3
commit 0470689215
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/plat-os2emx/grp.py
View File

@ -58,11 +58,11 @@ import os
# try and find the group file # try and find the group file
__group_path = [] __group_path = []
if os.environ.has_key('ETC_GROUP'): if 'ETC_GROUP' in os.environ:
__group_path.append(os.environ['ETC_GROUP']) __group_path.append(os.environ['ETC_GROUP'])
if os.environ.has_key('ETC'): if 'ETC' in os.environ:
__group_path.append('%s/group' % os.environ['ETC']) __group_path.append('%s/group' % os.environ['ETC'])
if os.environ.has_key('PYTHONHOME'): if 'PYTHONHOME' in os.environ:
__group_path.append('%s/Etc/group' % os.environ['PYTHONHOME']) __group_path.append('%s/Etc/group' % os.environ['PYTHONHOME'])
group_file = None group_file = None
@ -149,9 +149,9 @@ def __read_group_file():
fields[2] = int(fields[2]) fields[2] = int(fields[2])
fields[3] = [f.strip() for f in fields[3].split(',')] fields[3] = [f.strip() for f in fields[3].split(',')]
record = Group(*fields) record = Group(*fields)
if not gidx.has_key(fields[2]): if fields[2] not in gidx:
gidx[fields[2]] = record gidx[fields[2]] = record
if not namx.has_key(fields[0]): if fields[0] not in namx:
namx[fields[0]] = record namx[fields[0]] = record
elif len(entry) > 0: elif len(entry) > 0:
pass # skip empty or malformed records pass # skip empty or malformed records

12
Lib/plat-os2emx/pwd.py
View File

@ -61,11 +61,11 @@ import os
# try and find the passwd file # try and find the passwd file
__passwd_path = [] __passwd_path = []
if os.environ.has_key('ETC_PASSWD'): if 'ETC_PASSWD' in os.environ:
__passwd_path.append(os.environ['ETC_PASSWD']) __passwd_path.append(os.environ['ETC_PASSWD'])
if os.environ.has_key('ETC'): if 'ETC' in os.environ:
__passwd_path.append('%s/passwd' % os.environ['ETC']) __passwd_path.append('%s/passwd' % os.environ['ETC'])
if os.environ.has_key('PYTHONHOME'): if 'PYTHONHOME' in os.environ:
__passwd_path.append('%s/Etc/passwd' % os.environ['PYTHONHOME']) __passwd_path.append('%s/Etc/passwd' % os.environ['PYTHONHOME'])
passwd_file = None passwd_file = None
@ -164,7 +164,7 @@ def __read_passwd_file():
uidx = {} uidx = {}
namx = {} namx = {}
sep = None sep = None
while 1: while True:
entry = passwd.readline().strip() entry = passwd.readline().strip()
if len(entry) > 6: if len(entry) > 6:
if sep == None: if sep == None:
@ -175,9 +175,9 @@ def __read_passwd_file():
for i in (5, 6): for i in (5, 6):
fields[i] = __field_sep[sep](fields[i]) fields[i] = __field_sep[sep](fields[i])
record = Passwd(*fields) record = Passwd(*fields)
if not uidx.has_key(fields[2]): if fields[2] not in uidx:
uidx[fields[2]] = record uidx[fields[2]] = record
if not namx.has_key(fields[0]): if fields[0] not in namx:
namx[fields[0]] = record namx[fields[0]] = record
elif len(entry) > 0: elif len(entry) > 0:
pass # skip empty or malformed records pass # skip empty or malformed records