diff options
| author | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2014-10-04 20:05:08 +0200 |
|---|---|---|
| committer | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2014-10-04 20:05:08 +0200 |
| commit | b1aa203bb31a9c0edd3fe76b4d38ad7fce2b15f4 (patch) | |
| tree | 98a658bb2f33cb9ba034c5369e6d2fc8231246c4 /testsuite/timeout/timeout.py | |
| parent | 8d95768c80baf47526d08b89e3beba24233fb448 (diff) | |
| download | haskell-wip/python3-new.tar.gz | |
Restore Python 3 support (Trac #9184)wip/python3-new
This reverts commit e4a597f2f527ba0cd15cb51dda15cb51871c984e.
Conflicts:
testsuite/driver/testlib.py
Diffstat (limited to 'testsuite/timeout/timeout.py')
| -rw-r--r-- | testsuite/timeout/timeout.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/timeout/timeout.py b/testsuite/timeout/timeout.py index 6a57ac2f82..df50806b9b 100644 --- a/testsuite/timeout/timeout.py +++ b/testsuite/timeout/timeout.py @@ -21,7 +21,7 @@ try: os.killpg(pid, signal.SIGKILL) else: return - except OSError, e: + except OSError as e: if e.errno == errno.ECHILD: return else: |