mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-25 19:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #6815: os.path.expandvars() now supports non-ASCII environment

Browse source 
variables names and values.
This commit is contained in:
Serhiy Storchaka 2014-02-13 10:13:53 +02:00
parent 61e2493b83
commit dbb101909d
5 changed files with 96 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Lib/ntpath.py
View file

@ -362,6 +362,7 @@ def expandvars(path):
percent = b'%'
brace = b'{'
dollar = b'$'
environ = getattr(os, 'environb', None)
else:
if '$' not in path and '%' not in path:
return path
@ -371,6 +372,7 @@ def expandvars(path):
percent = '%'
brace = '{'
dollar = '$'
environ = os.environ
res = path[:0]
index = 0
pathlen = len(path)
@ -399,14 +401,13 @@ def expandvars(path):
index = pathlen - 1
else:
var = path[:index]
if isinstance(path, bytes):
var = var.decode('ascii')
if var in os.environ:
value = os.environ[var]
else:
value = '%' + var + '%'
if isinstance(path, bytes):
value = value.encode('ascii')
try:
if environ is None:
value = os.fsencode(os.environ[os.fsdecode(var)])
else:
value = environ[var]
except KeyError:
value = percent + var + percent
res += value
elif c == dollar: # variable or '$$'
if path[index + 1:index + 2] == dollar:
@ -420,39 +421,40 @@ def expandvars(path):
index = path.index(b'}')
else:
index = path.index('}')
var = path[:index]
if isinstance(path, bytes):
var = var.decode('ascii')
if var in os.environ:
value = os.environ[var]
else:
value = '${' + var + '}'
if isinstance(path, bytes):
value = value.encode('ascii')
res += value
except ValueError:
if isinstance(path, bytes):
res += b'${' + path
else:
res += '${' + path
index = pathlen - 1
else:
var = path[:index]
try:
if environ is None:
value = os.fsencode(os.environ[os.fsdecode(var)])
else:
value = environ[var]
except KeyError:
if isinstance(path, bytes):
value = b'${' + var + b'}'
else:
value = '${' + var + '}'
res += value
else:
var = ''
var = path[:0]
index += 1
c = path[index:index + 1]
while c and c in varchars:
if isinstance(path, bytes):
var += c.decode('ascii')
else:
var += c
var += c
index += 1
c = path[index:index + 1]
if var in os.environ:
value = os.environ[var]
else:
value = '$' + var
if isinstance(path, bytes):
value = value.encode('ascii')
try:
if environ is None:
value = os.fsencode(os.environ[os.fsdecode(var)])
else:
value = environ[var]
except KeyError:
value = dollar + var
res += value
if c:
index -= 1