summaryrefslogtreecommitdiffstats
path: root/Lib/ntpath.py
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2002-06-01 14:18:47 (GMT)
committerRaymond Hettinger <python@rcn.com>2002-06-01 14:18:47 (GMT)
commit54f0222547b1e92cd018ef132307a6f793dc9505 (patch)
tree667480d89feb3f9c7ca44e4ffa7bf39e725c120d /Lib/ntpath.py
parent9d5e4aa4149edb92f6d28c9390d776ae4a1d719a (diff)
downloadcpython-54f0222547b1e92cd018ef132307a6f793dc9505.zip
cpython-54f0222547b1e92cd018ef132307a6f793dc9505.tar.gz
cpython-54f0222547b1e92cd018ef132307a6f793dc9505.tar.bz2
SF 563203. Replaced 'has_key()' with 'in'.
Diffstat (limited to 'Lib/ntpath.py')
-rw-r--r--Lib/ntpath.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 370bd6e..7b758d0 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -343,9 +343,9 @@ def expanduser(path):
while i < n and path[i] not in '/\\':
i = i + 1
if i == 1:
- if os.environ.has_key('HOME'):
+ if 'HOME' in os.environ:
userhome = os.environ['HOME']
- elif not os.environ.has_key('HOMEPATH'):
+ elif not 'HOMEPATH' in os.environ:
return path
else:
try:
@@ -399,7 +399,7 @@ def expandvars(path):
try:
index = path.index('}')
var = path[:index]
- if os.environ.has_key(var):
+ if var in os.environ:
res = res + os.environ[var]
except ValueError:
res = res + path
@@ -412,7 +412,7 @@ def expandvars(path):
var = var + c
index = index + 1
c = path[index:index + 1]
- if os.environ.has_key(var):
+ if var in os.environ:
res = res + os.environ[var]
if c != '':
res = res + c