[pypy-commit] pypy rffi-parser-2: Use cffi's copy of pycparser

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: rffi-parser-2
Changeset: r89248:f895e2854833
Date: 2016-12-18 14:03 +0000
http://bitbucket.org/pypy/pypy/changeset/f895e2854833/

Log:	Use cffi's copy of pycparser

diff --git a/pypy/module/cpyext/cparser.py b/pypy/module/cpyext/cparser.py
--- a/pypy/module/cpyext/cparser.py
+++ b/pypy/module/cpyext/cparser.py
@@ -1,7 +1,10 @@
 from collections import OrderedDict
 from cffi import api, model
 from cffi.commontypes import COMMON_TYPES, resolve_common_type
-import pycparser
+try:
+    from cffi import _pycparser as pycparser
+except ImportError:
+    import pycparser
 import weakref, re
 from rpython.rlib.rfile import FILEP
 from rpython.rtyper.lltypesystem import rffi, lltype