[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r71472:3d3d331a4e18
Date: 2014-05-12 20:01 +0200
http://bitbucket.org/pypy/pypy/changeset/3d3d331a4e18/

Log:	merge heads

diff --git a/pypy/interpreter/test/test_app_main.py b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -7,9 +7,10 @@
 from rpython.tool.udir import udir
 from contextlib import contextmanager
 from pypy.conftest import pypydir
+from pypy.module.sys.version import PYPY_VERSION
 from lib_pypy._pypy_interact import irc_header
 
-is_release = sys.version_info[3] == "final"
+is_release = PYPY_VERSION[3] == "final"
 
 
 banner = sys.version.splitlines()[0]