summaryrefslogtreecommitdiffstats
path: root/PC/os2emx
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-05-17 18:20:34 (GMT)
committerGuido van Rossum <guido@python.org>2007-05-17 18:20:34 (GMT)
commitebe3e16600ddbc19aa7444ec773e2e0786b8a3cf (patch)
tree1189de0bc8de926ef5b1baa2f646cbd1674b8bab /PC/os2emx
parente35553e24c6b90db9ab22298cef663192972bbab (diff)
downloadcpython-ebe3e16600ddbc19aa7444ec773e2e0786b8a3cf.zip
cpython-ebe3e16600ddbc19aa7444ec773e2e0786b8a3cf.tar.gz
cpython-ebe3e16600ddbc19aa7444ec773e2e0786b8a3cf.tar.bz2
Merged revisions 55342-55406 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55360 | guido.van.rossum | 2007-05-15 14:57:59 -0700 (Tue, 15 May 2007) | 2 lines obcheckin. ........ r55361 | guido.van.rossum | 2007-05-15 14:59:18 -0700 (Tue, 15 May 2007) | 2 lines Get rid of strop module. ........ r55367 | brett.cannon | 2007-05-15 21:06:28 -0700 (Tue, 15 May 2007) | 2 lines Remove the 'pure' module. ........ r55369 | brett.cannon | 2007-05-15 21:07:31 -0700 (Tue, 15 May 2007) | 2 lines Remove the lib-old directory (already empty). ........ r55370 | neal.norwitz | 2007-05-15 21:30:40 -0700 (Tue, 15 May 2007) | 1 line Get rid of a bunch more references to strop ........ r55374 | brett.cannon | 2007-05-15 21:39:00 -0700 (Tue, 15 May 2007) | 2 lines Complete the removal of IRIX-specific modules. ........ r55379 | brett.cannon | 2007-05-15 22:31:54 -0700 (Tue, 15 May 2007) | 2 lines Update removed IRIX modules based on what is gone from removing plat-irix6. ........ r55388 | brett.cannon | 2007-05-16 14:34:52 -0700 (Wed, 16 May 2007) | 2 lines Clean up the docstring for the compiler resource. ........ r55406 | brett.cannon | 2007-05-17 11:05:37 -0700 (Thu, 17 May 2007) | 2 lines Remove BaseException.message (deprecated in Python 2.6). ........
Diffstat (limited to 'PC/os2emx')
-rw-r--r--PC/os2emx/Makefile1
-rw-r--r--PC/os2emx/config.c2
-rw-r--r--PC/os2emx/python25.def3
3 files changed, 0 insertions, 6 deletions
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index 25b88bb..0739f9c 100644
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -309,7 +309,6 @@ SRC.MODULES= $(addprefix $(TOP), \
Modules/sha256module.c \
Modules/sha512module.c \
Modules/_sre.c \
- Modules/stropmodule.c \
Modules/_struct.c \
Modules/symtablemodule.c \
Modules/termios.c \
diff --git a/PC/os2emx/config.c b/PC/os2emx/config.c
index b6d3fd6..f47941e 100644
--- a/PC/os2emx/config.c
+++ b/PC/os2emx/config.c
@@ -69,7 +69,6 @@ extern void initrgbimg();
extern void init_sha();
extern void init_sha256();
extern void init_sha512();
-extern void initstrop();
extern void init_struct();
extern void inittermios();
extern void inittime();
@@ -134,7 +133,6 @@ struct _inittab _PyImport_Inittab[] = {
{"_sha", init_sha},
{"_sha256", init_sha256},
{"_sha512", init_sha512},
- {"strop", initstrop},
{"_struct", init_struct},
{"termios", inittermios},
{"time", inittime},
diff --git a/PC/os2emx/python25.def b/PC/os2emx/python25.def
index 3c6004f..e262e23 100644
--- a/PC/os2emx/python25.def
+++ b/PC/os2emx/python25.def
@@ -1284,9 +1284,6 @@ EXPORTS
; From python25_s.lib(_sre)
; "init_sre"
-; From python25_s.lib(stropmodule)
-; "initstrop"
-
; From python25_s.lib(_struct)
; "init_struct"