Mercurial > public > mercurial-scm > hg

diff tests/killdaemons.py @ 25031:0adc22a0b6b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
python3: update killdaemons and run-tests print and exception syntax test-run-tests.t still passes fine on Python 2.6. run-tests.py --local no longer fails with syntax errors, and now fails looking for xrange. Most changes done with 2to3 -w -f numliterals -f except -f print tests/run-tests.py tests/killdaemons.py after which one import was fixed in run-tests and a __future__ import was added.
author Augie Fackler <augie@google.com>
date Sat, 11 Apr 2015 18:20:44 -0400
parents 476069509e72
children 123c99034cb6
line wrap: on
line diff
--- a/tests/killdaemons.py	Wed May 13 11:49:38 2015 -0700
+++ b/tests/killdaemons.py	Sat Apr 11 18:20:44 2015 -0400
@@ -64,7 +64,7 @@
                 os.kill(pid, 0)
             logfn('# Daemon process %d is stuck - really killing it' % pid)
             os.kill(pid, signal.SIGKILL)
-        except OSError, err:
+        except OSError as err:
             if err.errno != errno.ESRCH:
                 raise