diff options
| author | Guido van Rossum <guido@python.org> | 2007-01-10 16:19:56 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-01-10 16:19:56 +0000 |
| commit | b940e113bf90ff71b0ef57414ea2beea9d2a4bc0 (patch) | |
| tree | 0b9ea19eba1e665dac95126c3140ac2bc36326ad /Lib/bsddb/test/test_thread.py | |
| parent | 893523e80a2003d4a630aafb84ba016e0070cbbd (diff) | |
| download | cpython-git-b940e113bf90ff71b0ef57414ea2beea9d2a4bc0.tar.gz | |
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
Diffstat (limited to 'Lib/bsddb/test/test_thread.py')
| -rw-r--r-- | Lib/bsddb/test/test_thread.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/bsddb/test/test_thread.py b/Lib/bsddb/test/test_thread.py index bf19d21e6d..b3d7ef94e6 100644 --- a/Lib/bsddb/test/test_thread.py +++ b/Lib/bsddb/test/test_thread.py @@ -57,7 +57,7 @@ class BaseThreadedTestCase(unittest.TestCase): self.homeDir = homeDir try: os.mkdir(homeDir) - except OSError, e: + except OSError as e: if e.errno != errno.EEXIST: raise self.env = db.DBEnv() self.setEnvOpts() @@ -247,7 +247,7 @@ class SimpleThreadedBase(BaseThreadedTestCase): # flush them try: dbutils.DeadlockWrap(d.sync, max_retries=12) - except db.DBIncompleteError, val: + except db.DBIncompleteError as val: if verbose: print "could not complete sync()..." @@ -360,7 +360,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase): print "%s: records %d - %d finished" % (name, start, x) txn.commit() finished = True - except (db.DBLockDeadlockError, db.DBLockNotGrantedError), val: + except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val: if verbose: print "%s: Aborting transaction (%s)" % (name, val[1]) txn.abort() @@ -398,7 +398,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase): finished = True if verbose: print "%s: deleted records %s" % (name, recs) - except (db.DBLockDeadlockError, db.DBLockNotGrantedError), val: + except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val: if verbose: print "%s: Aborting transaction (%s)" % (name, val[1]) txn.abort() @@ -428,7 +428,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase): c.close() txn.commit() finished = True - except (db.DBLockDeadlockError, db.DBLockNotGrantedError), val: + except (db.DBLockDeadlockError, db.DBLockNotGrantedError) as val: if verbose: print "%s: Aborting transaction (%s)" % (name, val[1]) c.close() |