[Python-checkins] r82311 - in python/branches/py3k: Modules/_ctypes/libffi/fficonfig.py.in Modules/selectmodule.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Jun 28 01:49:45 2010
New Revision: 82311

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Modules/_ctypes/libffi/fficonfig.py.in
   python/branches/py3k/Modules/selectmodule.c

Modified: python/branches/py3k/Modules/_ctypes/libffi/fficonfig.py.in
==============================================================================
--- python/branches/py3k/Modules/_ctypes/libffi/fficonfig.py.in	(original)
+++ python/branches/py3k/Modules/_ctypes/libffi/fficonfig.py.in	Mon Jun 28 01:49:45 2010
@@ -6,7 +6,7 @@
     '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'],

Modified: python/branches/py3k/Modules/selectmodule.c
==============================================================================
--- python/branches/py3k/Modules/selectmodule.c	(original)
+++ python/branches/py3k/Modules/selectmodule.c	Mon Jun 28 01:49:45 2010
@@ -91,7 +91,7 @@
     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;