Merged revisions 63897-63898 via svnmerge from

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

........
  r63897 | thomas.heller | 2008-06-02 20:41:30 +0200 (Mon, 02 Jun 2008) | 1 line

  Fix misspelled sys.platform name and misspelled filename.
........
  r63898 | thomas.heller | 2008-06-02 22:07:46 +0200 (Mon, 02 Jun 2008) | 1 line

  Fix the -x flag so that is does work.
........

diff --git a/Lib/ctypes/test/__init__.py b/Lib/ctypes/test/__init__.py
index 97eef1b68678794fec083379bc18aee724537c40..bdcf62bc5389492d1ec7a7fa24f4fe6ee9d91ffc 100644 (file)
--- a/Lib/ctypes/test/__init__.py
+++ b/Lib/ctypes/test/__init__.py
@@ -178,7 +178,7 @@ def main(*packages):
         elif flag == "-u":
             use_resources.extend(value.split(","))
         elif flag == "-x":
-            exclude.append(value.split(","))
+            exclude.extend(value.split(","))
 
     mask = "test_*.py"
     if args:

diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
index f5f3810b0d91d63926865c7920275b11a2368d97..10293273588b1be8ccbfd0b4fec931af5123e389 100644 (file)
--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -25,7 +25,7 @@ ffi_platforms = {
     'SH64': ['src/sh64/sysv.S', 'src/sh64/ffi.c'],
     'PA': ['src/pa/linux.S', 'src/pa/ffi.c'],
     'PA_LINUX': ['src/pa/linux.S', 'src/pa/ffi.c'],
-    'PA_HPUX': ['src/pa/hpux32.s', 'src/pa/ffi.c'],
+    'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'],
 }
 
 ffi_srcdir = '@srcdir@'

diff --git a/setup.py b/setup.py
index 4921ded784086e0225a393d7863891e70fa054e5..1c46305b9fc277c9c4d1bd983205c3204c939af1 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1416,7 +1416,7 @@ class PyBuildExt(build_ext):
             # finding some -z option for the Sun compiler.
             extra_link_args.append('-mimpure-text')
 
-        elif sys.platform.startswith('hpux'):
+        elif sys.platform.startswith('hp-ux'):
             extra_link_args.append('-fPIC')
 
         ext = Extension('_ctypes',