Merged revisions 79894-79895,80098,80120 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79894 | jeroen.ruigrok | 2010-04-07 09:33:37 -0500 (Wed, 07 Apr 2010) | 5 lines

  FreeBSD is not a sysv platform, so use freebsd.S instead of sysv.S (as is
  also the case in FreeBSD's port of libffi).

  Reviewed by: dickinsm
........
  r79895 | jeroen.ruigrok | 2010-04-07 11:34:08 -0500 (Wed, 07 Apr 2010) | 2 lines

  Document the libffi FreeBSD fix.
........
  r80098 | benjamin.peterson | 2010-04-15 16:42:16 -0500 (Thu, 15 Apr 2010) | 1 line

  add space
........
  r80120 | antoine.pitrou | 2010-04-16 16:34:02 -0500 (Fri, 16 Apr 2010) | 3 lines

  Ignore jinja2
........

diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
index 045d7c3b8d9445440ebd9ef1f03ea043b5c2db2d..b7bae9ccb578634d03e9b48c2584dfb681d9e602 100644 (file)
--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -6,7 +6,7 @@ ffi_platforms = {
     'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'],
     'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'],
     'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'],
-    'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/sysv.S'],
+    'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'],
     'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'],
     'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'],
     'ALPHA': ['src/alpha/ffi.c', 'src/alpha/osf.S'],

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index f334153edf903662910ba60c0218fd291fa8cca6..7de7be9a6632e9732c2cc9ce2c88cc89a58a4b5a 100644 (file)
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -91,7 +91,7 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
     fd2obj[0].obj = (PyObject*)0;            /* set list to zero size */
     FD_ZERO(set);
 
-    fast_seq=PySequence_Fast(seq, "arguments 1-3 must be sequences");
+    fast_seq = PySequence_Fast(seq, "arguments 1-3 must be sequences");
     if (!fast_seq)
         return -1;