[Python-checkins] r77466 - in python/trunk: Misc/NEWS Modules/_ctypes/libffi/fficonfig.py.in setup.py
antoine.pitrou
python-checkins at python.org
Wed Jan 13 12:47:49 CET 2010
Author: antoine.pitrou
Date: Wed Jan 13 12:47:49 2010
New Revision: 77466
Log:
Issue #7661: Allow ctypes to be built from a non-ASCII directory path.
Patch by Florent Xicluna.
Modified:
python/trunk/Misc/NEWS
python/trunk/Modules/_ctypes/libffi/fficonfig.py.in
python/trunk/setup.py
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Wed Jan 13 12:47:49 2010
@@ -39,6 +39,12 @@
Extension extra options may change the output without changing the .c
file). Initial patch by Collin Winter.
+Build
+-----
+
+- Issue #7661: Allow ctypes to be built from a non-ASCII directory path.
+ Patch by Florent Xicluna.
+
What's New in Python 2.7 alpha 2?
=================================
Modified: python/trunk/Modules/_ctypes/libffi/fficonfig.py.in
==============================================================================
--- python/trunk/Modules/_ctypes/libffi/fficonfig.py.in (original)
+++ python/trunk/Modules/_ctypes/libffi/fficonfig.py.in Wed Jan 13 12:47:49 2010
@@ -28,8 +28,6 @@
'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'],
}
-ffi_srcdir = '@srcdir@'
ffi_sources += ffi_platforms['@TARGET@']
-ffi_sources = [os.path.join('@srcdir@', f) for f in ffi_sources]
ffi_cflags = '@CFLAGS@'
Modified: python/trunk/setup.py
==============================================================================
--- python/trunk/setup.py (original)
+++ python/trunk/setup.py Wed Jan 13 12:47:49 2010
@@ -813,7 +813,7 @@
print "being ignored (4.6.x must be >= 4.6.21)"
continue
- if ( (not db_ver_inc_map.has_key(db_ver)) and
+ if ( (db_ver not in db_ver_inc_map) and
allow_db_ver(db_ver) ):
# save the include directory with the db.h version
# (first occurrence only)
@@ -1732,17 +1732,18 @@
return False
fficonfig = {}
- execfile(ffi_configfile, globals(), fficonfig)
- ffi_srcdir = os.path.join(fficonfig['ffi_srcdir'], 'src')
+ exec open(ffi_configfile) in fficonfig
# Add .S (preprocessed assembly) to C compiler source extensions.
self.compiler_obj.src_extensions.append('.S')
include_dirs = [os.path.join(ffi_builddir, 'include'),
- ffi_builddir, ffi_srcdir]
+ ffi_builddir,
+ os.path.join(ffi_srcdir, 'src')]
extra_compile_args = fficonfig['ffi_cflags'].split()
- ext.sources.extend(fficonfig['ffi_sources'])
+ ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
+ fficonfig['ffi_sources'])
ext.include_dirs.extend(include_dirs)
ext.extra_compile_args.extend(extra_compile_args)
return True
More information about the Python-checkins
mailing list