[pypy-commit] pypy py3.5: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r89758:6b430d93c851
Date: 2017-01-25 10:45 +0100
http://bitbucket.org/pypy/pypy/changeset/6b430d93c851/

Log:	merge heads

diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -225,6 +225,7 @@
     RegrTest('test_format.py', core=True),
     RegrTest('test_fractions.py'),
     RegrTest('test_frame.py'),
+    RegrTest('test_fstring.py'),
     RegrTest('test_ftplib.py'),
     RegrTest('test_funcattrs.py', core=True),
     RegrTest('test_functools.py'),