Author: Maciej Fijalkowski <[email protected]> Branch: Changeset: r1222:b8eb8ed2ede6 Date: 2013-04-02 21:17 +0200 http://bitbucket.org/cffi/cffi/changeset/b8eb8ed2ede6/
Log: fixes diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -14,3 +14,7 @@ ------- [Mailing list](https://groups.google.com/forum/#!forum/python-cffi) + +To run tests under CPython, run: + +python setup.py build_ext -i diff --git a/cffi/cparser.py b/cffi/cparser.py --- a/cffi/cparser.py +++ b/cffi/cparser.py @@ -1,7 +1,11 @@ from . import api, model from .commontypes import COMMON_TYPES, resolve_common_type -import pycparser.c_parser, weakref, re, sys +try: + from cffi import _pycparser as pycparser +except ImportError: + import pycparser +import weakref, re, sys try: if sys.version_info < (3,): @@ -513,7 +517,7 @@ nextenumvalue = self._parse_constant(enum.value) enumvalues.append(nextenumvalue) nextenumvalue += 1 - enumvalues = tuple(enumvalues) + enumvalues = tuple(enumvalues) tp = model.EnumType(explicit_name, enumerators, enumvalues) tp.partial = partial else: # opaque enum diff --git a/testing/test_zintegration.py b/testing/test_zintegration.py --- a/testing/test_zintegration.py +++ b/testing/test_zintegration.py @@ -18,7 +18,7 @@ site_packages = dirpath break if site_packages: - for module in ('cffi', '_cffi_backend', 'pycparser', 'ply'): + for module in ('cffi', '_cffi_backend', 'pycparser'): target = imp.find_module(module)[1] os.symlink(target, os.path.join(site_packages, os.path.basename(target))) _______________________________________________ pypy-commit mailing list [email protected] http://mail.python.org/mailman/listinfo/pypy-commit
