mirror of
https://github.com/python/cpython.git
synced 2025-08-27 20:25:18 +00:00
SF patch 1631942 by Collin Winter:
(a) "except E, V" -> "except E as V" (b) V is now limited to a simple name (local variable) (c) V is now deleted at the end of the except block
This commit is contained in:
parent
893523e80a
commit
b940e113bf
295 changed files with 817 additions and 743 deletions
|
@ -32,13 +32,13 @@ def main():
|
|||
return 1
|
||||
try:
|
||||
os.mkdir(newtree, 0777)
|
||||
except os.error, msg:
|
||||
except os.error as msg:
|
||||
print newtree + ': cannot mkdir:', msg
|
||||
return 1
|
||||
linkname = os.path.join(newtree, link)
|
||||
try:
|
||||
os.symlink(os.path.join(os.pardir, oldtree), linkname)
|
||||
except os.error, msg:
|
||||
except os.error as msg:
|
||||
if not link_may_fail:
|
||||
print linkname + ': cannot symlink:', msg
|
||||
return 1
|
||||
|
@ -51,7 +51,7 @@ def linknames(old, new, link):
|
|||
if debug: print 'linknames', (old, new, link)
|
||||
try:
|
||||
names = os.listdir(old)
|
||||
except os.error, msg:
|
||||
except os.error as msg:
|
||||
print old + ': warning: cannot listdir:', msg
|
||||
return
|
||||
for name in names:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue