[Python-checkins] r66554 - in python/trunk: Include/pystrcmp.h Lib/test/test_io.py PC/os2emx/Makefile PC/os2emx/config.c PC/os2emx/pyconfig.h

[andrew.macintyre]

Author: andrew.macintyre
Date: Mon Sep 22 16:23:45 2008
New Revision: 66554

Log:
build_os2emx.patch in issue 3868 - update OS/2 EMX makefile and config files

Part of source_os2emx.patch in issue 3868:
  Include/pystrcmp.h:  OS/2 has same C APIs as Windows
  Lib/test/test_io.py: OS/2 has same behaviour as Windows for this test

Reviewed by Amaury Forgeot d'Arc


Modified:
   python/trunk/Include/pystrcmp.h
   python/trunk/Lib/test/test_io.py
   python/trunk/PC/os2emx/Makefile
   python/trunk/PC/os2emx/config.c
   python/trunk/PC/os2emx/pyconfig.h

Modified: python/trunk/Include/pystrcmp.h
==============================================================================
--- python/trunk/Include/pystrcmp.h	(original)
+++ python/trunk/Include/pystrcmp.h	Mon Sep 22 16:23:45 2008
@@ -8,7 +8,7 @@
 PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t);
 PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *);
 
-#ifdef MS_WINDOWS
+#if defined(MS_WINDOWS) || defined(PYOS_OS2)
 #define PyOS_strnicmp strnicmp
 #define PyOS_stricmp stricmp
 #else

Modified: python/trunk/Lib/test/test_io.py
==============================================================================
--- python/trunk/Lib/test/test_io.py	(original)
+++ python/trunk/Lib/test/test_io.py	Mon Sep 22 16:23:45 2008
@@ -201,7 +201,7 @@
         # On Windows and Mac OSX this test comsumes large resources; It takes
         # a long time to build the >2GB file and takes >2GB of disk space
         # therefore the resource must be enabled to run this test.
-        if sys.platform[:3] == 'win' or sys.platform == 'darwin':
+        if sys.platform[:3] in ('win', 'os2') or sys.platform == 'darwin':
             if not test_support.is_resource_enabled("largefile"):
                 print("\nTesting large file ops skipped on %s." % sys.platform,
                       file=sys.stderr)

Modified: python/trunk/PC/os2emx/Makefile
==============================================================================
--- python/trunk/PC/os2emx/Makefile	(original)
+++ python/trunk/PC/os2emx/Makefile	Mon Sep 22 16:23:45 2008
@@ -287,7 +287,7 @@
 		Modules/binascii.c \
 		Modules/cmathmodule.c \
 		Modules/_codecsmodule.c \
-		Modules/collectionsmodule.c \
+		Modules/_collectionsmodule.c \
 		Modules/cPickle.c \
 		Modules/cStringIO.c \
 		Modules/_csv.c \
@@ -295,6 +295,7 @@
 		Modules/dlmodule.c \
 		Modules/errnomodule.c \
 		Modules/fcntlmodule.c \
+		Modules/_fileio.c \
 		Modules/_functoolsmodule.c \
 		Modules/_heapqmodule.c \
 		Modules/imageop.c \
@@ -305,7 +306,6 @@
 		Modules/md5module.c \
 		Modules/operator.c \
 		Modules/_randommodule.c \
-		Modules/rgbimgmodule.c \
 		Modules/shamodule.c \
 		Modules/sha256module.c \
 		Modules/sha512module.c \
@@ -343,6 +343,8 @@
 		Python/compile.c \
 		Python/codecs.c \
 		Python/errors.c \
+		Python/formatter_string.c \
+		Python/formatter_unicode.c \
 		Python/frozen.c \
 		Python/frozenmain.c \
 		Python/future.c \
@@ -359,8 +361,10 @@
 		Python/modsupport.c \
 		Python/mysnprintf.c \
 		Python/mystrtoul.c \
+		Python/peephole.c \
 		Python/pyarena.c \
 		Python/pyfpe.c \
+		Python/pymath.c \
 		Python/pystate.c \
 		Python/pystrtod.c \
 		Python/pythonrun.c \
@@ -370,11 +374,14 @@
 		Python/traceback.c \
 		Python/getopt.c \
 		Python/dynload_shlib.c \
-		Python/thread.c)
+		Python/thread.c \
+		Python/_warnings.c)
 SRC.OBJECT=	$(addprefix $(TOP), \
 		Objects/abstract.c \
 		Objects/boolobject.c \
 		Objects/bufferobject.c \
+		Objects/bytearrayobject.c \
+		Objects/bytes_methods.c \
 		Objects/cellobject.c \
 		Objects/classobject.c \
 		Objects/cobject.c \

Modified: python/trunk/PC/os2emx/config.c
==============================================================================
--- python/trunk/PC/os2emx/config.c	(original)
+++ python/trunk/PC/os2emx/config.c	Mon Sep 22 16:23:45 2008
@@ -52,12 +52,13 @@
 extern void initbinascii();
 extern void initcPickle();
 extern void initcStringIO();
-extern void initcollections();
+extern void init_collections();
 extern void initcmath();
 extern void initdatetime();
 extern void initdl();
 extern void initerrno();
 extern void initfcntl();
+extern void init_fileio();
 extern void init_functools();
 extern void init_heapq();
 extern void initimageop();
@@ -65,7 +66,6 @@
 extern void initmath();
 extern void init_md5();
 extern void initoperator();
-extern void initrgbimg();
 extern void init_sha();
 extern void init_sha256();
 extern void init_sha512();
@@ -118,12 +118,13 @@
 	{"binascii", initbinascii},
 	{"cPickle", initcPickle},
 	{"cStringIO", initcStringIO},
-	{"collections", initcollections},
+	{"_collections", init_collections},
 	{"cmath", initcmath},
 	{"datetime", initdatetime},
 	{"dl", initdl},
 	{"errno", initerrno},
 	{"fcntl", initfcntl},
+	{"_fileio", init_fileio},
 	{"_functools", init_functools},
 	{"_heapq", init_heapq},
 	{"imageop", initimageop},
@@ -131,7 +132,6 @@
 	{"math", initmath},
 	{"_md5", init_md5},
 	{"operator", initoperator},
-	{"rgbimg", initrgbimg},
 	{"_sha", init_sha},
 	{"_sha256", init_sha256},
 	{"_sha512", init_sha512},

Modified: python/trunk/PC/os2emx/pyconfig.h
==============================================================================
--- python/trunk/PC/os2emx/pyconfig.h	(original)
+++ python/trunk/PC/os2emx/pyconfig.h	Mon Sep 22 16:23:45 2008
@@ -264,6 +264,9 @@
 /* Define if you have the <conio.h> header file. */
 #undef HAVE_CONIO_H
 
+/* Define to 1 if you have the `copysign' function. */
+#define HAVE_COPYSIGN 1
+
 /* Define if you have the <direct.h> header file. */
 #undef HAVE_DIRECT_H