Mercurial > cpython-lru_cache-weakref
diff setup.py @ 58295:15b0668f0dc5
Note: I'm merging these changes out of consistency, but they don't seem
to be needed in py3k (except perhaps for non-utf8 paths).
Merged revisions 77466-77467 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77466 | antoine.pitrou | 2010-01-13 12:47:49 +0100 (mer., 13 janv. 2010) | 5 lines
Issue #7661: Allow ctypes to be built from a non-ASCII directory path.
Patch by Florent Xicluna.
........
r77467 | antoine.pitrou | 2010-01-13 12:57:42 +0100 (mer., 13 janv. 2010) | 3 lines
Use `with`
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Wed, 13 Jan 2010 12:04:20 +0000 |
| parents | f2d54096dc8c |
| children | 5aa90248a99f |
line wrap: on
line diff
--- a/setup.py Wed Jan 13 09:19:15 2010 +0000 +++ b/setup.py Wed Jan 13 12:04:20 2010 +0000 @@ -1498,22 +1498,19 @@ return False fficonfig = {} - fp = open(ffi_configfile) - try: - script = fp.read() - finally: - fp.close() - exec(script, globals(), fficonfig) - ffi_srcdir = os.path.join(fficonfig['ffi_srcdir'], 'src') + with open(ffi_configfile) as f: + exec(f.read(), globals(), 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