summaryrefslogtreecommitdiff
path: root/tests/pexpectTest.py
diff options
context:
space:
mode:
authorThomas Kluyver <takowl@gmail.com>2013-09-17 15:52:47 -0700
committerThomas Kluyver <takowl@gmail.com>2013-09-17 15:52:47 -0700
commit5cdccd73558298331d580792f48986b24b8bc3c9 (patch)
treeea18f463327a5376777c015c392bd66c4ef0141f /tests/pexpectTest.py
parent98012748c31623b0c99103ebb79d111ee0c8317c (diff)
downloadpexpect-git-5cdccd73558298331d580792f48986b24b8bc3c9.tar.gz
Use new style except statements in tests
Diffstat (limited to 'tests/pexpectTest.py')
-rwxr-xr-xtests/pexpectTest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/pexpectTest.py b/tests/pexpectTest.py
index 62ac422..613e9a9 100755
--- a/tests/pexpectTest.py
+++ b/tests/pexpectTest.py
@@ -38,11 +38,11 @@ def getProcessResults(cmd, timeLimit=20):
# newlines can show up as '\r\n' so we kill any '\r's which
# will mess up the formatting for the viewer
output += child.read_nonblocking(timeout=timeLimit).replace("\r","")
- except pexpect.EOF, e:
+ except pexpect.EOF as e:
print str(e)
# process terminated normally
break
- except pexpect.TIMEOUT, e:
+ except pexpect.TIMEOUT as e:
print str(e)
output += "\nProcess aborted by FlashTest after %s seconds.\n" % timeLimit
print child.isalive()