mirror of
https://github.com/python/cpython.git
synced 2025-08-30 13:38:43 +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
|
@ -117,7 +117,7 @@ class RunModuleTest(unittest.TestCase):
|
|||
entry = parts[0]
|
||||
try:
|
||||
del sys.modules[entry]
|
||||
except KeyError, ex:
|
||||
except KeyError as ex:
|
||||
if verbose: print ex # Persist with cleaning up
|
||||
if verbose: print " Removed sys.modules entries"
|
||||
del sys.path[0]
|
||||
|
@ -126,18 +126,18 @@ class RunModuleTest(unittest.TestCase):
|
|||
for name in files:
|
||||
try:
|
||||
os.remove(os.path.join(root, name))
|
||||
except OSError, ex:
|
||||
except OSError as ex:
|
||||
if verbose: print ex # Persist with cleaning up
|
||||
for name in dirs:
|
||||
fullname = os.path.join(root, name)
|
||||
try:
|
||||
os.rmdir(fullname)
|
||||
except OSError, ex:
|
||||
except OSError as ex:
|
||||
if verbose: print ex # Persist with cleaning up
|
||||
try:
|
||||
os.rmdir(top)
|
||||
if verbose: print " Removed package tree"
|
||||
except OSError, ex:
|
||||
except OSError as ex:
|
||||
if verbose: print ex # Persist with cleaning up
|
||||
|
||||
def _check_module(self, depth):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue