Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r58779:f8749badf1b2 Date: 2012-11-07 11:38 +0100 http://bitbucket.org/pypy/pypy/changeset/f8749badf1b2/
Log: merge heads diff --git a/pypy/tool/pytest/inttest.py b/pypy/tool/pytest/inttest.py --- a/pypy/tool/pytest/inttest.py +++ b/pypy/tool/pytest/inttest.py @@ -3,6 +3,7 @@ # Most pypy tests are of this kind. import py +import sys from pypy.interpreter.error import OperationError from pypy.conftest import PyPyClassCollector _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit
