Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r2633:97b191f401bd
Date: 2016-02-13 16:32 +0100
http://bitbucket.org/cffi/cffi/changeset/97b191f401bd/
Log: Fix for Python 2.6
diff --git a/cffi/api.py b/cffi/api.py
--- a/cffi/api.py
+++ b/cffi/api.py
@@ -1,4 +1,4 @@
-import sys, sysconfig, types
+import sys, types
from .lock import allocate_lock
try:
@@ -571,6 +571,10 @@
if hasattr(sys, 'gettotalrefcount'):
template += '_d'
else:
+ try:
+ import sysconfig
+ except ImportError: # 2.6
+ from distutils import sysconfig
template = "python%d.%d"
if sysconfig.get_config_var('DEBUG_EXT'):
template += sysconfig.get_config_var('DEBUG_EXT')
diff --git a/testing/cffi0/test_zintegration.py
b/testing/cffi0/test_zintegration.py
--- a/testing/cffi0/test_zintegration.py
+++ b/testing/cffi0/test_zintegration.py
@@ -4,6 +4,9 @@
if sys.platform == 'win32':
py.test.skip('snippets do not run on win32')
+if sys.version_info < (2, 7):
+ py.test.skip('fails e.g. on a Debian/Ubuntu which patches virtualenv'
+ ' in a non-2.6-friendly way')
def create_venv(name):
tmpdir = udir.join(name)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
