[Python-3000-checkins] r57369 - in python/branches/py3k: Modules/Setup.dist PC/VC6/pythoncore.dsp PC/os2emx/Makefile PC/os2emx/config.c PC/os2emx/python25.def PC/os2vacpp/config.c PC/os2vacpp/makefile PC/os2vacpp/makefile.omk PCbuild8/pythoncore/pythoncore.vcproj

[neal.norwitz]

Author: neal.norwitz
Date: Fri Aug 24 04:51:04 2007
New Revision: 57369

Modified:
   python/branches/py3k/Modules/Setup.dist
   python/branches/py3k/PC/VC6/pythoncore.dsp
   python/branches/py3k/PC/os2emx/Makefile
   python/branches/py3k/PC/os2emx/config.c
   python/branches/py3k/PC/os2emx/python25.def
   python/branches/py3k/PC/os2vacpp/config.c
   python/branches/py3k/PC/os2vacpp/makefile
   python/branches/py3k/PC/os2vacpp/makefile.omk
   python/branches/py3k/PCbuild8/pythoncore/pythoncore.vcproj
Log:
cPickle was removed

Modified: python/branches/py3k/Modules/Setup.dist
==============================================================================
--- python/branches/py3k/Modules/Setup.dist	(original)
+++ python/branches/py3k/Modules/Setup.dist	Fri Aug 24 04:51:04 2007
@@ -350,9 +350,8 @@
 # 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.

Modified: python/branches/py3k/PC/VC6/pythoncore.dsp
==============================================================================
--- python/branches/py3k/PC/VC6/pythoncore.dsp	(original)
+++ python/branches/py3k/PC/VC6/pythoncore.dsp	Fri Aug 24 04:51:04 2007
@@ -273,10 +273,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\cPickle.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\zlib\crc32.c
 # End Source File
 # Begin Source File

Modified: python/branches/py3k/PC/os2emx/Makefile
==============================================================================
--- python/branches/py3k/PC/os2emx/Makefile	(original)
+++ python/branches/py3k/PC/os2emx/Makefile	Fri Aug 24 04:51:04 2007
@@ -287,7 +287,6 @@
 		Modules/cmathmodule.c \
 		Modules/_codecsmodule.c \
 		Modules/collectionsmodule.c \
-		Modules/cPickle.c \
 		Modules/cStringIO.c \
 		Modules/_csv.c \
 		Modules/datetimemodule.c \

Modified: python/branches/py3k/PC/os2emx/config.c
==============================================================================
--- python/branches/py3k/PC/os2emx/config.c	(original)
+++ python/branches/py3k/PC/os2emx/config.c	Fri Aug 24 04:51:04 2007
@@ -50,7 +50,6 @@
 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 @@
 	{"_weakref", init_weakref},
 	{"array", initarray},
 	{"binascii", initbinascii},
-	{"cPickle", initcPickle},
 	{"cStringIO", initcStringIO},
 	{"collections", initcollections},
 	{"cmath", initcmath},

Modified: python/branches/py3k/PC/os2emx/python25.def
==============================================================================
--- python/branches/py3k/PC/os2emx/python25.def	(original)
+++ python/branches/py3k/PC/os2emx/python25.def	Fri Aug 24 04:51:04 2007
@@ -1196,10 +1196,6 @@
   "dequeiter_type"
   "dequereviter_type"
 
-; From python25_s.lib(cPickle)
-;  "initcPickle"
-;  "fast_save_leave"
-
 ; From python25_s.lib(cStringIO)
 ;  "initcStringIO"
 

Modified: python/branches/py3k/PC/os2vacpp/config.c
==============================================================================
--- python/branches/py3k/PC/os2vacpp/config.c	(original)
+++ python/branches/py3k/PC/os2vacpp/config.c	Fri Aug 24 04:51:04 2007
@@ -35,7 +35,6 @@
 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 @@
         {"thread", initthread},
 #endif
         {"cStringIO", initcStringIO},
-        {"cPickle", initcPickle},
         {"pcre", initpcre},
 #ifdef WIN32
         {"msvcrt", initmsvcrt},

Modified: python/branches/py3k/PC/os2vacpp/makefile
==============================================================================
--- python/branches/py3k/PC/os2vacpp/makefile	(original)
+++ python/branches/py3k/PC/os2vacpp/makefile	Fri Aug 24 04:51:04 2007
@@ -180,7 +180,6 @@
                   $(PATHOBJ)\ArrayModule.obj   \
                   $(PATHOBJ)\BinAscii.obj      \
                   $(PATHOBJ)\CMathModule.obj   \
-                  $(PATHOBJ)\cPickle.obj       \
                   $(PATHOBJ)\cStringIO.obj     \
                   $(PATHOBJ)\ErrnoModule.obj   \
                   $(PATHOBJ)\GCModule.obj      \

Modified: python/branches/py3k/PC/os2vacpp/makefile.omk
==============================================================================
--- python/branches/py3k/PC/os2vacpp/makefile.omk	(original)
+++ python/branches/py3k/PC/os2vacpp/makefile.omk	Fri Aug 24 04:51:04 2007
@@ -142,7 +142,6 @@
                   ArrayModule.obj   \
                   BinAscii.obj      \
                   CMathModule.obj   \
-                  cPickle.obj       \
                   cStringIO.obj     \
                   ErrnoModule.obj   \
                   GetBuildInfo.obj  \

Modified: python/branches/py3k/PCbuild8/pythoncore/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PCbuild8/pythoncore/pythoncore.vcproj	(original)
+++ python/branches/py3k/PCbuild8/pythoncore/pythoncore.vcproj	Fri Aug 24 04:51:04 2007
@@ -1450,10 +1450,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\cPickle.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\cStringIO.c"
 				>
 			</File>