Author: Armin Rigo <[email protected]>
Branch: 
Changeset: r86277:5f6febd4256c
Date: 2016-08-18 16:53 +0200
http://bitbucket.org/pypy/pypy/changeset/5f6febd4256c/

Log:    Uh. This was probably converted from "except KeyboardInterrupt,
        RuntimeError:", which was buggy in the first place

diff --git a/pypy/tool/pytest/genreportdata.py 
b/pypy/tool/pytest/genreportdata.py
--- a/pypy/tool/pytest/genreportdata.py
+++ b/pypy/tool/pytest/genreportdata.py
@@ -17,7 +17,7 @@
             resultwc = py.path.svnwc(testresultdir)
             print "updating", resultwc
             resultwc.update()
-        except KeyboardInterrupt as RuntimeError:
+        except (KeyboardInterrupt, RuntimeError):
             raise
         except Exception as e: #py.process.ExecutionFailed,e:
             print >> sys.stderr, "Warning: ",e #Subversion update failed"
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to