65 files changed, 32 insertions, 59 deletions
diff --git a/_cffi1/__init__.py b/_cffi1/__init__.py
deleted file mode 100644
index a41544f..0000000
--- a/_cffi1/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .recompiler import make_c_source, recompile
diff --git a/_cffi1/setup.py b/_cffi1/setup.py
deleted file mode 100644
index f786ace..0000000
--- a/_cffi1/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from distutils.core import setup
-from distutils.extension import Extension
-setup(name='realize_c_type',
-      ext_modules=[Extension(name='realize_c_type',
-                             sources=['realize_c_type.c',
-                                      'parse_c_type.c'])])
diff --git a/_cffi1/support.py b/_cffi1/support.py
deleted file mode 100644
index 17c56cd..0000000
--- a/_cffi1/support.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import sys
-
-if sys.version_info < (3,):
-    __all__ = ['u']
-
-    class U(object):
-        def __add__(self, other):
-            return eval('u'+repr(other).replace(r'\\u', r'\u')
-                                       .replace(r'\\U', r'\U'))
-    u = U()
-    assert u+'a\x00b' == eval(r"u'a\x00b'")
-    assert u+'a\u1234b' == eval(r"u'a\u1234b'")
-    assert u+'a\U00012345b' == eval(r"u'a\U00012345b'")
-
-else:
-    __all__ = ['u', 'unicode', 'long']
-    u = ""
-    unicode = str
-    long = int
diff --git a/_cffi1/udir.py b/_cffi1/udir.py
deleted file mode 100644
index bbdd744..0000000
--- a/_cffi1/udir.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import py
-
-udir = py.path.local.make_numbered_dir(prefix = 'cffi1-')
diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
index fcccded..84ada7a 100644
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -5764,7 +5764,7 @@ static PyObject *b__testbuff(PyObject *self, PyObject *args)
 }
 
 static PyObject *b_init_cffi_1_0_external_module(PyObject *, PyObject *);
-/* forward, see _cffi1/cffi1_module.c */
+/* forward, see cffi1_module.c */
 
 
 static PyMethodDef FFIBackendMethods[] = {
@@ -5948,7 +5948,7 @@ static void *cffi_exports[] = {
 
 /************************************************************/
 
-#include "../_cffi1/cffi1_module.c"
+#include "cffi1_module.c"
 
 /************************************************************/
 
diff --git a/_cffi1/cdlopen.c b/c/cdlopen.c
index 7276273..7276273 100644
--- a/_cffi1/cdlopen.c
+++ b/c/cdlopen.c
diff --git a/_cffi1/cffi1_module.c b/c/cffi1_module.c
index 5cea0e2..5cea0e2 100644
--- a/_cffi1/cffi1_module.c
+++ b/c/cffi1_module.c
diff --git a/_cffi1/cgc.c b/c/cgc.c
index 2c07ff1..2c07ff1 100644
--- a/_cffi1/cgc.c
+++ b/c/cgc.c
diff --git a/_cffi1/cglob.c b/c/cglob.c
index bb7e48d..bb7e48d 100644
--- a/_cffi1/cglob.c
+++ b/c/cglob.c
diff --git a/_cffi1/ffi_obj.c b/c/ffi_obj.c
index d5644ad..d5644ad 100644
--- a/_cffi1/ffi_obj.c
+++ b/c/ffi_obj.c
diff --git a/_cffi1/lib_obj.c b/c/lib_obj.c
index 724317c..724317c 100644
--- a/_cffi1/lib_obj.c
+++ b/c/lib_obj.c
diff --git a/_cffi1/parse_c_type.c b/c/parse_c_type.c
index 25ae4b7..6fcd73c 100644
--- a/_cffi1/parse_c_type.c
+++ b/c/parse_c_type.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 
 #define _CFFI_INTERNAL
-#include "parse_c_type.h"
+#include "../cffi/parse_c_type.h"
 
 
 enum token_e {
diff --git a/_cffi1/realize_c_type.c b/c/realize_c_type.c
index 61be3da..61be3da 100644
--- a/_cffi1/realize_c_type.c
+++ b/c/realize_c_type.c
diff --git a/_cffi1/_cffi_include.h b/cffi/_cffi_include.h
index 84cb3a9..84cb3a9 100644
--- a/_cffi1/_cffi_include.h
+++ b/cffi/_cffi_include.h
diff --git a/cffi/api.py b/cffi/api.py
index 989d86c..d09a8e1 100644
--- a/cffi/api.py
+++ b/cffi/api.py
@@ -486,7 +486,7 @@ class FFI(object):
 
     def distutils_extension(self, tmpdir='build', verbose=True):
         from distutils.dir_util import mkpath
-        from _cffi1 import recompile
+        from .recompiler import recompile
         #
         if not hasattr(self, '_assigned_source'):
             if hasattr(self, 'verifier'):     # fallback, 'tmpdir' ignored
@@ -506,7 +506,7 @@ class FFI(object):
         return ext
 
     def emit_c_code(self, filename):
-        from _cffi1 import recompile
+        from .recompiler import recompile
         #
         if not hasattr(self, '_assigned_source'):
             raise ValueError("set_source() must be called before emit_c_code()")
@@ -515,7 +515,7 @@ class FFI(object):
                   c_file=filename, call_c_compiler=False, **kwds)
 
     def compile(self, tmpdir='.'):
-        from _cffi1 import recompile
+        from .recompiler import recompile
         #
         if not hasattr(self, '_assigned_source'):
             raise ValueError("set_source() must be called before compile()")
diff --git a/_cffi1/cffi_opcode.py b/cffi/cffi_opcode.py
index 1972aeb..1972aeb 100644
--- a/_cffi1/cffi_opcode.py
+++ b/cffi/cffi_opcode.py
diff --git a/_cffi1/parse_c_type.h b/cffi/parse_c_type.h
index 2320803..2320803 100644
--- a/_cffi1/parse_c_type.h
+++ b/cffi/parse_c_type.h
diff --git a/_cffi1/recompiler.py b/cffi/recompiler.py
index cf9398d..977456f 100644
--- a/_cffi1/recompiler.py
+++ b/cffi/recompiler.py
@@ -933,8 +933,9 @@ def recompile(ffi, module_name, preamble, tmpdir='.',
     else:
         return ext, updated
 
-def verify(ffi, module_name, preamble, *args, **kwds):
-    from _cffi1.udir import udir
+def _verify(ffi, module_name, preamble, *args, **kwds):
+    # FOR TESTS ONLY
+    from testing.udir import udir
     import imp
     assert module_name not in sys.modules, "module name conflict: %r" % (
         module_name,)
diff --git a/_cffi1/setuptools_ext.py b/cffi/setuptools_ext.py
index d42de50..d42de50 100644
--- a/_cffi1/setuptools_ext.py
+++ b/cffi/setuptools_ext.py
diff --git a/_cffi1/manual.c b/demo/manual.c
index 38539b8..38539b8 100644
--- a/_cffi1/manual.c
+++ b/demo/manual.c
diff --git a/_cffi1/manual2.py b/demo/manual2.py
index d5c49b0..d5c49b0 100644
--- a/_cffi1/manual2.py
+++ b/demo/manual2.py
diff --git a/_cffi1/setup_manual.py b/demo/setup_manual.py
index 2569bb4..2569bb4 100644
--- a/_cffi1/setup_manual.py
+++ b/demo/setup_manual.py
diff --git a/testing/cffi0/__init__.py b/testing/cffi0/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testing/cffi0/__init__.py
diff --git a/testing/backend_tests.py b/testing/cffi0/backend_tests.py
index d3b5ca1..d3b5ca1 100644
--- a/testing/backend_tests.py
+++ b/testing/cffi0/backend_tests.py
diff --git a/testing/callback_in_thread.py b/testing/cffi0/callback_in_thread.py
index c98605c..c98605c 100644
--- a/testing/callback_in_thread.py
+++ b/testing/cffi0/callback_in_thread.py
diff --git a/testing/snippets/distutils_module/setup.py b/testing/cffi0/snippets/distutils_module/setup.py
index a4d5551..a4d5551 100644
--- a/testing/snippets/distutils_module/setup.py
+++ b/testing/cffi0/snippets/distutils_module/setup.py
diff --git a/testing/snippets/distutils_module/snip_basic_verify.py b/testing/cffi0/snippets/distutils_module/snip_basic_verify.py
index e8a867e..e8a867e 100644
--- a/testing/snippets/distutils_module/snip_basic_verify.py
+++ b/testing/cffi0/snippets/distutils_module/snip_basic_verify.py
diff --git a/testing/snippets/distutils_package_1/setup.py b/testing/cffi0/snippets/distutils_package_1/setup.py
index e3d28a5..e3d28a5 100644
--- a/testing/snippets/distutils_package_1/setup.py
+++ b/testing/cffi0/snippets/distutils_package_1/setup.py
diff --git a/testing/snippets/distutils_package_1/snip_basic_verify1/__init__.py b/testing/cffi0/snippets/distutils_package_1/snip_basic_verify1/__init__.py
index e8a867e..e8a867e 100644
--- a/testing/snippets/distutils_package_1/snip_basic_verify1/__init__.py
+++ b/testing/cffi0/snippets/distutils_package_1/snip_basic_verify1/__init__.py
diff --git a/testing/snippets/distutils_package_2/setup.py b/testing/cffi0/snippets/distutils_package_2/setup.py
index 6d8f72a..6d8f72a 100644
--- a/testing/snippets/distutils_package_2/setup.py
+++ b/testing/cffi0/snippets/distutils_package_2/setup.py
diff --git a/testing/snippets/distutils_package_2/snip_basic_verify2/__init__.py b/testing/cffi0/snippets/distutils_package_2/snip_basic_verify2/__init__.py
index b4ee686..b4ee686 100644
--- a/testing/snippets/distutils_package_2/snip_basic_verify2/__init__.py
+++ b/testing/cffi0/snippets/distutils_package_2/snip_basic_verify2/__init__.py
diff --git a/testing/snippets/infrastructure/setup.py b/testing/cffi0/snippets/infrastructure/setup.py
index ea89f50..ea89f50 100644
--- a/testing/snippets/infrastructure/setup.py
+++ b/testing/cffi0/snippets/infrastructure/setup.py
diff --git a/testing/snippets/infrastructure/snip_infrastructure/__init__.py b/testing/cffi0/snippets/infrastructure/snip_infrastructure/__init__.py
index dad950d..dad950d 100644
--- a/testing/snippets/infrastructure/snip_infrastructure/__init__.py
+++ b/testing/cffi0/snippets/infrastructure/snip_infrastructure/__init__.py
diff --git a/testing/snippets/setuptools_module/setup.py b/testing/cffi0/snippets/setuptools_module/setup.py
index 30f2e04..30f2e04 100644
--- a/testing/snippets/setuptools_module/setup.py
+++ b/testing/cffi0/snippets/setuptools_module/setup.py
diff --git a/testing/snippets/setuptools_module/snip_setuptools_verify.py b/testing/cffi0/snippets/setuptools_module/snip_setuptools_verify.py
index e8a867e..e8a867e 100644
--- a/testing/snippets/setuptools_module/snip_setuptools_verify.py
+++ b/testing/cffi0/snippets/setuptools_module/snip_setuptools_verify.py
diff --git a/testing/snippets/setuptools_package_1/setup.py b/testing/cffi0/snippets/setuptools_package_1/setup.py
index 18ea3f6..18ea3f6 100644
--- a/testing/snippets/setuptools_package_1/setup.py
+++ b/testing/cffi0/snippets/setuptools_package_1/setup.py
diff --git a/testing/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py b/testing/cffi0/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py
index e8a867e..e8a867e 100644
--- a/testing/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py
+++ b/testing/cffi0/snippets/setuptools_package_1/snip_setuptools_verify1/__init__.py
diff --git a/testing/snippets/setuptools_package_2/setup.py b/testing/cffi0/snippets/setuptools_package_2/setup.py
index 87fb22b..87fb22b 100644
--- a/testing/snippets/setuptools_package_2/setup.py
+++ b/testing/cffi0/snippets/setuptools_package_2/setup.py
diff --git a/testing/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py b/testing/cffi0/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py
index 5f4bd13..5f4bd13 100644
--- a/testing/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py
+++ b/testing/cffi0/snippets/setuptools_package_2/snip_setuptools_verify2/__init__.py
diff --git a/testing/test_cdata.py b/testing/cffi0/test_cdata.py
index 116d0b3..116d0b3 100644
--- a/testing/test_cdata.py
+++ b/testing/cffi0/test_cdata.py
diff --git a/testing/test_ctypes.py b/testing/cffi0/test_ctypes.py
index d2b53ed..1b88473 100644
--- a/testing/test_ctypes.py
+++ b/testing/cffi0/test_ctypes.py
@@ -1,5 +1,5 @@
 import py, sys
-from testing import backend_tests
+from testing.cffi0 import backend_tests
 from cffi.backend_ctypes import CTypesBackend
 
 
diff --git a/testing/test_ffi_backend.py b/testing/cffi0/test_ffi_backend.py
index 4ea8b69..72bc650 100644
--- a/testing/test_ffi_backend.py
+++ b/testing/cffi0/test_ffi_backend.py
@@ -1,6 +1,6 @@
 import py, sys, platform
 import pytest
-from testing import backend_tests, test_function, test_ownlib
+from testing.cffi0 import backend_tests, test_function, test_ownlib
 from cffi import FFI
 import _cffi_backend
 
diff --git a/testing/test_function.py b/testing/cffi0/test_function.py
index 99bf63f..99bf63f 100644
--- a/testing/test_function.py
+++ b/testing/cffi0/test_function.py
diff --git a/testing/test_model.py b/testing/cffi0/test_model.py
index 5e58c6e..5e58c6e 100644
--- a/testing/test_model.py
+++ b/testing/cffi0/test_model.py
diff --git a/testing/test_ownlib.py b/testing/cffi0/test_ownlib.py
index b56fb95..b56fb95 100644
--- a/testing/test_ownlib.py
+++ b/testing/cffi0/test_ownlib.py
diff --git a/testing/test_parsing.py b/testing/cffi0/test_parsing.py
index adcf468..adcf468 100644
--- a/testing/test_parsing.py
+++ b/testing/cffi0/test_parsing.py
diff --git a/testing/test_platform.py b/testing/cffi0/test_platform.py
index 55446ec..55446ec 100644
--- a/testing/test_platform.py
+++ b/testing/cffi0/test_platform.py
diff --git a/testing/test_unicode_literals.py b/testing/cffi0/test_unicode_literals.py
index 7b0a5cc..7b0a5cc 100644
--- a/testing/test_unicode_literals.py
+++ b/testing/cffi0/test_unicode_literals.py
diff --git a/testing/test_verify.py b/testing/cffi0/test_verify.py
index 729c095..729c095 100644
--- a/testing/test_verify.py
+++ b/testing/cffi0/test_verify.py
diff --git a/testing/test_verify2.py b/testing/cffi0/test_verify2.py
index a4af6d6..a4af6d6 100644
--- a/testing/test_verify2.py
+++ b/testing/cffi0/test_verify2.py
diff --git a/testing/test_version.py b/testing/cffi0/test_version.py
index a36db5e..a36db5e 100644
--- a/testing/test_version.py
+++ b/testing/cffi0/test_version.py
diff --git a/testing/test_vgen.py b/testing/cffi0/test_vgen.py
index 1a7e05d..1a7e05d 100644
--- a/testing/test_vgen.py
+++ b/testing/cffi0/test_vgen.py
diff --git a/testing/test_vgen2.py b/testing/cffi0/test_vgen2.py
index 34147c8..34147c8 100644
--- a/testing/test_vgen2.py
+++ b/testing/cffi0/test_vgen2.py
diff --git a/testing/test_zdistutils.py b/testing/cffi0/test_zdistutils.py
index b313ae7..b313ae7 100644
--- a/testing/test_zdistutils.py
+++ b/testing/cffi0/test_zdistutils.py
diff --git a/testing/test_zintegration.py b/testing/cffi0/test_zintegration.py
index 25eec0b..25eec0b 100644
--- a/testing/test_zintegration.py
+++ b/testing/cffi0/test_zintegration.py
diff --git a/testing/cffi1/__init__.py b/testing/cffi1/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testing/cffi1/__init__.py
diff --git a/_cffi1/test_cffi_binary.py b/testing/cffi1/test_cffi_binary.py
index 25953db..25953db 100644
--- a/_cffi1/test_cffi_binary.py
+++ b/testing/cffi1/test_cffi_binary.py
diff --git a/_cffi1/test_dlopen.py b/testing/cffi1/test_dlopen.py
index 4056ff6..4056ff6 100644
--- a/_cffi1/test_dlopen.py
+++ b/testing/cffi1/test_dlopen.py
diff --git a/_cffi1/test_ffi_obj.py b/testing/cffi1/test_ffi_obj.py
index 2def7e6..2def7e6 100644
--- a/_cffi1/test_ffi_obj.py
+++ b/testing/cffi1/test_ffi_obj.py
diff --git a/_cffi1/test_new_ffi_1.py b/testing/cffi1/test_new_ffi_1.py
index c1fc6bb..d517f99 100644
--- a/_cffi1/test_new_ffi_1.py
+++ b/testing/cffi1/test_new_ffi_1.py
@@ -2,9 +2,10 @@ import py
 import platform, imp
 import sys, os, ctypes
 import cffi
-from .udir import udir
-from .recompiler import recompile
-from .support import *
+from testing.udir import udir
+from testing.support import *
+from cffi.recompiler import recompile
+from cffi.cffi_opcode import PRIMITIVE_TO_INDEX
 
 SIZE_OF_INT   = ctypes.sizeof(ctypes.c_int)
 SIZE_OF_LONG  = ctypes.sizeof(ctypes.c_long)
@@ -1596,7 +1597,6 @@ class TestNewFFI1:
         assert list(a) == [10000, 20500, 30000]
 
     def test_all_primitives(self):
-        from .cffi_opcode import PRIMITIVE_TO_INDEX
         assert set(PRIMITIVE_TO_INDEX) == set([
             "char",
             "short",
diff --git a/_cffi1/test_parse_c_type.py b/testing/cffi1/test_parse_c_type.py
index 77537ed..1f2e81a 100644
--- a/_cffi1/test_parse_c_type.py
+++ b/testing/cffi1/test_parse_c_type.py
@@ -1,13 +1,13 @@
 import sys, re, os, py
 import cffi
-from . import cffi_opcode
+from cffi import cffi_opcode
 
-local_dir = os.path.dirname(__file__)
+cffi_dir = os.path.dirname(cffi_opcode.__file__)
 
 r_macro = re.compile(r"#define \w+[(][^\n]*|#include [^\n]*")
 r_define = re.compile(r"(#define \w+) [^\n]*")
 r_ifdefs = re.compile(r"(#ifdef |#endif)[^\n]*")
-header = open(os.path.join(local_dir, 'parse_c_type.h')).read()
+header = open(os.path.join(cffi_dir, 'parse_c_type.h')).read()
 header = r_macro.sub(r"", header)
 header = r_define.sub(r"\1 ...", header)
 header = r_ifdefs.sub(r"", header)
@@ -15,8 +15,9 @@ header = r_ifdefs.sub(r"", header)
 ffi = cffi.FFI()
 ffi.cdef(header)
 
-lib = ffi.verify(open(os.path.join(local_dir, 'parse_c_type.c')).read(),
-                 include_dirs=[local_dir])
+lib = ffi.verify(
+        open(os.path.join(cffi_dir, '..', 'c', 'parse_c_type.c')).read(),
+        include_dirs=[cffi_dir])
 
 class ParseError(Exception):
     pass
diff --git a/_cffi1/test_realize_c_type.py b/testing/cffi1/test_realize_c_type.py
index 784db5d..801f0e4 100644
--- a/_cffi1/test_realize_c_type.py
+++ b/testing/cffi1/test_realize_c_type.py
@@ -1,4 +1,5 @@
 import py
+from cffi import cffi_opcode
 
 
 def check(input, expected_output=None, expected_ffi_error=False):
@@ -43,6 +44,5 @@ def test_funcptr_rewrite_args():
     check("int(*)(long[5])", "int(*)(long *)")
 
 def test_all_primitives():
-    from . import cffi_opcode
     for name in cffi_opcode.PRIMITIVE_TO_INDEX:
         check(name, name)
diff --git a/_cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py
index 6241d7e..71d7f5a 100644
--- a/_cffi1/test_recompiler.py
+++ b/testing/cffi1/test_recompiler.py
@@ -1,8 +1,8 @@
 import sys, os, py
 from cffi import FFI, VerificationError
-from _cffi1 import recompiler
-from _cffi1.udir import udir
-from _cffi1.support import u
+from cffi import recompiler
+from testing.udir import udir
+from testing.support import u
 
 
 def check_type_table(input, expected_output, included=None):
@@ -18,7 +18,7 @@ def check_type_table(input, expected_output, included=None):
 
 def verify(ffi, module_name, *args, **kwds):
     kwds.setdefault('undef_macros', ['NDEBUG'])
-    return recompiler.verify(ffi, '_CFFI_' + module_name, *args, **kwds)
+    return recompiler._verify(ffi, '_CFFI_' + module_name, *args, **kwds)
 
 
 def test_type_table_func():
diff --git a/_cffi1/test_unicode_literals.py b/testing/cffi1/test_unicode_literals.py
index e9825db..e9825db 100644
--- a/_cffi1/test_unicode_literals.py
+++ b/testing/cffi1/test_unicode_literals.py
diff --git a/_cffi1/test_verify1.py b/testing/cffi1/test_verify1.py
index 9aeb974..bf40b49 100644
--- a/_cffi1/test_verify1.py
+++ b/testing/cffi1/test_verify1.py
@@ -1,7 +1,7 @@
 import sys, math, py
 from cffi import FFI, VerificationError, VerificationMissing, model
-from . import recompiler
-from .support import *
+from cffi import recompiler
+from testing.support import *
 import _cffi_backend
 
 lib_m = ['m']
@@ -29,10 +29,10 @@ class FFI(FFI):
 
     def verify(self, preamble='', *args, **kwds):
         FFI._verify_counter += 1
-        return recompiler.verify(self, 'verify%d' % FFI._verify_counter,
-                                 preamble, *args,
-                                 extra_compile_args=self._extra_compile_args,
-                                 **kwds)
+        return recompiler._verify(self, 'verify%d' % FFI._verify_counter,
+                                  preamble, *args,
+                                  extra_compile_args=self._extra_compile_args,
+                                  **kwds)
 
 class FFI_warnings_not_error(FFI):
     _extra_compile_args = []