[pypy-commit] pypy py3k: fix after merge

pjenvey pypy.commits at gmail.com
Sun May 8 14:33:01 EDT 2016


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r84306:7832fcede2fc
Date: 2016-05-08 11:32 -0700
http://bitbucket.org/pypy/pypy/changeset/7832fcede2fc/

Log:	fix after merge

diff --git a/pypy/module/cpyext/test/test_version.py b/pypy/module/cpyext/test/test_version.py
--- a/pypy/module/cpyext/test/test_version.py
+++ b/pypy/module/cpyext/test/test_version.py
@@ -1,4 +1,6 @@
-import py
+import sys
+
+import py, pytest
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
 
 


More information about the pypy-commit mailing list