Author: David Schneider <david.schnei...@picle.org>
Branch:
Changeset: r63103:7d116d0b63bf
Date: 2013-04-06 13:32 +0200
http://bitbucket.org/pypy/pypy/changeset/7d116d0b63bf/
Log: merge heads
diff --git a/pypy/module/test_lib_pypy/test_sqlite3.py
b/pypy/module/test_lib_pypy/test_sqlite3.py
--- a/pypy/module/test_lib_pypy/test_sqlite3.py
+++ b/pypy/module/test_lib_pypy/test_sqlite3.py
@@ -1,6 +1,15 @@
"""Tests for _sqlite3.py"""
-import pytest
+import pytest, sys
+
+if sys.version_info < (2, 7):
+ pytest.skip("_sqlite3 requires Python 2.7")
+try:
+ import _cffi_backend
+except ImportError:
+ # On CPython, "pip install cffi". On old PyPy's, no chance
+ pytest.skip("_sqlite3 requires _cffi_backend to be installed")
+
from lib_pypy import _sqlite3
def pytest_funcarg__con(request):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
