summaryrefslogtreecommitdiffstats
path: root/Lib/ntpath.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-07-23 08:46:35 (GMT)
committerGeorg Brandl <georg@python.org>2010-07-23 08:46:35 (GMT)
commit599b65deca618fb7d6ff1e7955ab7aac66fa6645 (patch)
treeaeaf4c3815e0f471354b45bf6273f9c5af42aef1 /Lib/ntpath.py
parentdb902ac0b4df295bd90109852c1abd05da831b81 (diff)
downloadcpython-599b65deca618fb7d6ff1e7955ab7aac66fa6645.zip
cpython-599b65deca618fb7d6ff1e7955ab7aac66fa6645.tar.gz
cpython-599b65deca618fb7d6ff1e7955ab7aac66fa6645.tar.bz2
Use augassign.
Diffstat (limited to 'Lib/ntpath.py')
-rw-r--r--Lib/ntpath.py44
1 files changed, 22 insertions, 22 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index ab0b318..a6bcca4 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -275,7 +275,7 @@ def split(p):
# set i to index beyond p's last slash
i = len(p)
while i and p[i-1] not in seps:
- i = i - 1
+ i -= 1
head, tail = p[:i], p[i:] # now tail has no slashes
# remove trailing slashes from head, unless it's all slashes
head2 = head
@@ -366,7 +366,7 @@ def expanduser(path):
return path
i, n = 1, len(path)
while i < n and path[i] not in _get_bothseps(path):
- i = i + 1
+ i += 1
if 'HOME' in os.environ:
userhome = os.environ['HOME']
@@ -435,21 +435,21 @@ def expandvars(path):
pathlen = len(path)
try:
index = path.index(c)
- res = res + c + path[:index + 1]
+ res += c + path[:index + 1]
except ValueError:
- res = res + path
+ res += path
index = pathlen - 1
elif c == percent: # variable or '%'
if path[index + 1:index + 2] == percent:
- res = res + c
- index = index + 1
+ res += c
+ index += 1
else:
path = path[index+1:]
pathlen = len(path)
try:
index = path.index(percent)
except ValueError:
- res = res + percent + path
+ res += percent + path
index = pathlen - 1
else:
var = path[:index]
@@ -461,11 +461,11 @@ def expandvars(path):
value = '%' + var + '%'
if isinstance(path, bytes):
value = value.encode('ascii')
- res = res + value
+ res += value
elif c == dollar: # variable or '$$'
if path[index + 1:index + 2] == dollar:
- res = res + c
- index = index + 1
+ res += c
+ index += 1
elif path[index + 1:index + 2] == brace:
path = path[index+2:]
pathlen = len(path)
@@ -483,23 +483,23 @@ def expandvars(path):
value = '${' + var + '}'
if isinstance(path, bytes):
value = value.encode('ascii')
- res = res + value
+ res += value
except ValueError:
if isinstance(path, bytes):
- res = res + b'${' + path
+ res += b'${' + path
else:
- res = res + '${' + path
+ res += '${' + path
index = pathlen - 1
else:
var = ''
- index = index + 1
+ index += 1
c = path[index:index + 1]
while c and c in varchars:
if isinstance(path, bytes):
- var = var + c.decode('ascii')
+ var += c.decode('ascii')
else:
- var = var + c
- index = index + 1
+ var += c
+ index += 1
c = path[index:index + 1]
if var in os.environ:
value = os.environ[var]
@@ -507,12 +507,12 @@ def expandvars(path):
value = '$' + var
if isinstance(path, bytes):
value = value.encode('ascii')
- res = res + value
+ res += value
if c:
- index = index - 1
+ index -= 1
else:
- res = res + c
- index = index + 1
+ res += c
+ index += 1
return res
@@ -529,7 +529,7 @@ def normpath(path):
# collapse initial backslashes
if path.startswith(sep):
- prefix = prefix + sep
+ prefix += sep
path = path.lstrip(sep)
comps = path.split(sep)