The declarations for API functions are now read directly from the source files, using the /*OBJECT_API*/ (and similiar) tags.

The order of the API functions is determined by the *_api_order.txt files in
code_generators/. Also, the code_generators/generate_*.py files are imported
instead of using execfile() in setup.py, with common routines held in genapi.py.

1 files changed, 17 insertions, 12 deletions

diff --git a/scipy/base/setup.py b/scipy/base/setup.py
index 48a8fa425..0ba180c27 100644
--- a/scipy/base/setup.py
+++ b/scipy/base/setup.py
@@ -101,12 +101,15 @@ def configuration(parent_package='',top_path=None):
         target = join(build_dir,'__multiarray_api.h')
         script = join(codegen_dir,'generate_array_api.py')
         if newer(script,target):
-            script = os.path.abspath(script)
-            old_cwd = os.getcwd()
-            os.chdir(build_dir)
-            print 'executing',script
-            execfile(script,{},{})
-            os.chdir(old_cwd)
+            old_sys_path = sys.path
+            try:
+                sys.path.insert(0, codegen_dir)
+                print sys.path
+                import generate_array_api
+                print 'executing',script
+                generate_array_api.generate_api(build_dir)
+            finally:
+                sys.path = old_sys_path
         config.add_data_files((header_dir,target))
         return target
 
@@ -114,12 +117,14 @@ def configuration(parent_package='',top_path=None):
         target = join(build_dir,'__ufunc_api.h')
         script = join(codegen_dir,'generate_ufunc_api.py')
         if newer(script,target):
-            script = os.path.abspath(script)
-            old_cwd = os.getcwd()
-            os.chdir(build_dir)
-            print 'executing',script
-            execfile(script,{},{})
-            os.chdir(old_cwd)
+            old_sys_path = sys.path
+            try:
+                sys.path.insert(0, codegen_dir)
+                import generate_ufunc_api
+                print 'executing',script
+                generate_ufunc_api.generate_api(build_dir)
+            finally:
+                sys.path = old_sys_path
         config.add_data_files((header_dir,target))
         return target