cPickle was removed

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index 86b8f842c09e68e830c178eb1eac6ee8d97f2eb8..17445d5db2b09d51cfa9dfad9d6fab9234081d82 100644 (file)
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -350,9 +350,8 @@ _symtable symtablemodule.c
 # Fred Drake's interface to the Python parser
 #parser parsermodule.c
 
-# cStringIO and cPickle
+# cStringIO
 #cStringIO cStringIO.c
-#cPickle cPickle.c
 
 
 # Lee Busby's SIGFPE modules.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 02c1f358a2ad0d31828ceaae33414502e96a251b..70b64ea3a0463f87d080bb9d1c81641ee4c0dd2b 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -273,10 +273,6 @@ SOURCE=..\config.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\cPickle.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\zlib\crc32.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index 0761fb1830b74906c8d46f9590edb548f335713a..b84d22bd3f954a632529f5ca9949cff0ed646a5a 100644 (file)
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -287,7 +287,6 @@ SRC.MODULES=        $(addprefix $(TOP), \
                Modules/cmathmodule.c \
                Modules/_codecsmodule.c \
                Modules/collectionsmodule.c \
-               Modules/cPickle.c \
                Modules/cStringIO.c \
                Modules/_csv.c \
                Modules/datetimemodule.c \

diff --git a/PC/os2emx/config.c b/PC/os2emx/config.c
index 26714a3dca7a278be24fe959d8758325b7078d84..529fe2cb4a4b8cc7695ad32895590abc40389109 100644 (file)
--- a/PC/os2emx/config.c
+++ b/PC/os2emx/config.c
@@ -50,7 +50,6 @@ extern void init_symtable();
 extern void init_weakref();
 extern void initarray();
 extern void initbinascii();
-extern void initcPickle();
 extern void initcStringIO();
 extern void initcollections();
 extern void initcmath();
@@ -112,7 +111,6 @@ struct _inittab _PyImport_Inittab[] = {
        {"_weakref", init_weakref},
        {"array", initarray},
        {"binascii", initbinascii},
-       {"cPickle", initcPickle},
        {"cStringIO", initcStringIO},
        {"collections", initcollections},
        {"cmath", initcmath},

diff --git a/PC/os2emx/python25.def b/PC/os2emx/python25.def
index c7dddf552c59bd0162ce93e43891ca3d37d5c6cc..bb3d64f30ce6f8ba9aa0a1d4e9c6cd7929a6914e 100644 (file)
--- a/PC/os2emx/python25.def
+++ b/PC/os2emx/python25.def
@@ -1196,10 +1196,6 @@ EXPORTS
   "dequeiter_type"
   "dequereviter_type"
 
-; From python25_s.lib(cPickle)
-;  "initcPickle"
-;  "fast_save_leave"
-
 ; From python25_s.lib(cStringIO)
 ;  "initcStringIO"
 

diff --git a/PC/os2vacpp/config.c b/PC/os2vacpp/config.c
index 37f05548aba84be4502ea285e115fe4f4586dbe1..62bb8b28ab0be0fe822d4defe315da56f3576dea 100644 (file)
--- a/PC/os2vacpp/config.c
+++ b/PC/os2vacpp/config.c
@@ -35,7 +35,6 @@ extern void initstruct(void);
 extern void inittime(void);
 extern void initthread(void);
 extern void initcStringIO(void);
-extern void initcPickle(void);
 extern void initpcre(void);
 #ifdef WIN32
 extern void initmsvcrt(void);
@@ -80,7 +79,6 @@ struct _inittab _PyImport_Inittab[] = {
         {"thread", initthread},
 #endif
         {"cStringIO", initcStringIO},
-        {"cPickle", initcPickle},
         {"pcre", initpcre},
 #ifdef WIN32
         {"msvcrt", initmsvcrt},

diff --git a/PC/os2vacpp/makefile b/PC/os2vacpp/makefile
index c44f42aad008584e608bfa53c8e3c0cab59889a4..7e795669c078ab47425fc7d0bf65e9801a11e362 100644 (file)
--- a/PC/os2vacpp/makefile
+++ b/PC/os2vacpp/makefile
@@ -180,7 +180,6 @@ MODULES             =                              \
                   $(PATHOBJ)\ArrayModule.obj   \
                   $(PATHOBJ)\BinAscii.obj      \
                   $(PATHOBJ)\CMathModule.obj   \
-                  $(PATHOBJ)\cPickle.obj       \
                   $(PATHOBJ)\cStringIO.obj     \
                   $(PATHOBJ)\ErrnoModule.obj   \
                   $(PATHOBJ)\GCModule.obj      \

diff --git a/PC/os2vacpp/makefile.omk b/PC/os2vacpp/makefile.omk
index 4f123c1d73ca9b4bdf0473a7f247cfeae2d39c17..f0ed27398ad1e566f0a3322bedb7b9612dd08da1 100644 (file)
--- a/PC/os2vacpp/makefile.omk
+++ b/PC/os2vacpp/makefile.omk
@@ -142,7 +142,6 @@ MODULES             =                   \
                   ArrayModule.obj   \
                   BinAscii.obj      \
                   CMathModule.obj   \
-                  cPickle.obj       \
                   cStringIO.obj     \
                   ErrnoModule.obj   \
                   GetBuildInfo.obj  \

diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PCbuild8/pythoncore/pythoncore.vcproj
index 457cbb0aa4bbe72bfb7af3260100b7b3b43ea581..2a6e413e25ab24947764df2b9db148008da2b65f 100644 (file)
--- a/PCbuild8/pythoncore/pythoncore.vcproj
+++ b/PCbuild8/pythoncore/pythoncore.vcproj
@@ -1449,10 +1449,6 @@
                                RelativePath="..\..\Modules\cmathmodule.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Modules\cPickle.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\cStringIO.c"\r
                                >\r