[pypy-commit] pypy cffi-1.0: Update the importing tool

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: cffi-1.0
Changeset: r77375:64114b649ca5
Date: 2015-05-18 18:12 +0200
http://bitbucket.org/pypy/pypy/changeset/64114b649ca5/

Log:	Update the importing tool

diff --git a/pypy/tool/import_cffi.py b/pypy/tool/import_cffi.py
--- a/pypy/tool/import_cffi.py
+++ b/pypy/tool/import_cffi.py
@@ -18,16 +18,11 @@
     pypydir = py.path.local(__file__).join('..', '..')
     cffi_dest = pypydir.join('..', 'lib_pypy', 'cffi')
     cffi_dest.ensure(dir=1)
-    cffi1_dest = pypydir.join('..', 'lib_pypy', '_cffi1')
-    cffi1_dest.ensure(dir=1)
     test_dest = pypydir.join('module', 'test_lib_pypy', 'cffi_tests')
     test_dest.ensure(dir=1)
-    for p in cffi_dir.join('cffi').visit(fil='*.py'):
+    for p in (list(cffi_dir.join('cffi').visit(fil='*.py')) +
+              list(cffi_dir.join('cffi').visit(fil='*.h'))):
         cffi_dest.join('..', p.relto(cffi_dir)).write(p.read())
-    for p in cffi_dir.join('_cffi1').visit(fil='*.py'):
-        cffi1_dest.join('..', p.relto(cffi_dir)).write(p.read())
-    for p in cffi_dir.join('_cffi1').visit(fil='*.h'):
-        cffi1_dest.join('..', p.relto(cffi_dir)).write(p.read())
     for p in cffi_dir.join('testing').visit(fil='*.py'):
         path = test_dest.join(p.relto(cffi_dir.join('testing')))
         path.join('..').ensure(dir=1)