diff options
| author | Jon Severinsson <jon@severinsson.net> | 2013-04-13 01:39:44 +0200 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-04-16 21:05:05 -0700 |
| commit | 4dd720218003bfccc13d30e3e77baf29dc563146 (patch) | |
| tree | fe217219812ec6a7678572c5530689e39fd068eb | |
| parent | 309b5e47025587c54dfdcfc9d17a97ba25e81ab1 (diff) | |
framework: Consistently use Python 2.6+ syntax for exception objects.
The old syntax is no longer supported in Python 3.x.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | framework/core.py | 4 | ||||
| -rw-r--r-- | framework/junit.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/core.py b/framework/core.py index ed6f15ee..497bb363 100644 --- a/framework/core.py +++ b/framework/core.py @@ -188,7 +188,7 @@ def checkDir(dirname, failifexists): exists = True try: os.stat(dirname) - except OSError, e: + except OSError as e: if e.errno == errno.ENOENT or e.errno == errno.ENOTDIR: exists = False @@ -198,7 +198,7 @@ def checkDir(dirname, failifexists): try: os.makedirs(dirname) - except OSError, e: + except OSError as e: if e.errno != errno.EEXIST: raise diff --git a/framework/junit.py b/framework/junit.py index 8504795d..6c284ca8 100644 --- a/framework/junit.py +++ b/framework/junit.py @@ -307,9 +307,9 @@ class Test(BaseTest): try: try: return self.test(report) - except Failure, ex: + except Failure as ex: report.addFailure(*ex.args) - except Error, ex: + except Error as ex: report.addError(*ex.args) except KeyboardInterrupt: raise |