Remove more references to intobject.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index b774ca09c6c39496b7f00ec427f0d9d5c25739b1..02c1f358a2ad0d31828ceaae33414502e96a251b 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -431,10 +431,6 @@ SOURCE=..\..\Modules\zlib\inftrees.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Objects\intobject.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Objects\iterobject.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index e13a666221f3df8a9d93c7c59bf97d8f3f589cb7..0761fb1830b74906c8d46f9590edb548f335713a 100644 (file)
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -381,7 +381,6 @@ SRC.OBJECT= $(addprefix $(TOP), \
                Objects/frameobject.c \
                Objects/funcobject.c \
                Objects/genobject.c \
-               Objects/intobject.c \
                Objects/iterobject.c \
                Objects/listobject.c \
                Objects/longobject.c \
@@ -420,7 +419,7 @@ SRC.PGEN=   $(SRC.PARSE1) \
                Parser/printgrammar.c \
                Parser/grammar.c \
                Parser/firstsets.c) \
-               
+
 OBJ.PGEN=      $(addprefix $(OUT),$(notdir $(SRC.PGEN:.c=$O)))
 
 SRC.EXE=       $(TOP)Modules/python.c

diff --git a/PC/os2emx/python25.def b/PC/os2emx/python25.def
index a6eb97bc9deebf7922c126337ac97b93f7bc69f8..ef6bd1363036759cdf638312bbf563da745683c2 100644 (file)
--- a/PC/os2emx/python25.def
+++ b/PC/os2emx/python25.def
@@ -339,21 +339,6 @@ EXPORTS
   "PyGen_NeedsFinalizing"
   "PyGen_Type"
 
-; From python25_s.lib(intobject)
-  "PyInt_AsLong"
-  "PyInt_AsUnsignedLongMask"
-  "PyInt_AsUnsignedLongLongMask"
-  "PyInt_FromString"
-  "PyInt_AsSsize_t"
-  "PyInt_Fini"
-  "PyInt_FromUnicode"
-  "PyInt_FromLong"
-  "PyInt_FromSize_t"
-  "PyInt_FromSsize_t"
-  "PyInt_GetMax"
-  "_PyInt_Init"
-  "PyInt_Type"
-
 ; From python25_s.lib(iterobject)
   "PySeqIter_New"
   "PyCallIter_New"

diff --git a/PC/os2vacpp/makefile b/PC/os2vacpp/makefile
index cf961e07dde1cbba6fbd4db052ee8a18149039a8..c44f42aad008584e608bfa53c8e3c0cab59889a4 100644 (file)
--- a/PC/os2vacpp/makefile
+++ b/PC/os2vacpp/makefile
@@ -158,7 +158,6 @@ OBJECTS             =                              \
                   $(PATHOBJ)\FloatObject.obj   \
                   $(PATHOBJ)\FrameObject.obj   \
                   $(PATHOBJ)\FuncObject.obj    \
-                  $(PATHOBJ)\IntObject.obj     \
                   $(PATHOBJ)\IterObject.obj    \
                   $(PATHOBJ)\ListObject.obj    \
                   $(PATHOBJ)\LongObject.obj    \
@@ -1063,19 +1062,6 @@ funcobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\cla
         $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\structmember.h \
         $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
 
-intobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \
-        $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \
-        $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \
-        $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h $(PY_INCLUDE)\intobject.h \
-        $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h $(PY_INCLUDE)\longobject.h \
-        $(PY_INCLUDE)\methodobject.h $(PY_INCLUDE)\modsupport.h \
-        $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h $(PY_INCLUDE)\myproto.h \
-        $(PY_INCLUDE)\object.h $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h \
-        $(PY_INCLUDE)\pyerrors.h $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h \
-        $(PY_INCLUDE)\python.h $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h \
-        $(PY_INCLUDE)\sliceobject.h $(PY_INCLUDE)\stringobject.h \
-        $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
-
 listobject.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\classobject.h \
         $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h pyconfig.h \
         $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h $(PY_INCLUDE)\floatobject.h \
@@ -1609,4 +1595,3 @@ traceback.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h $(PY_INCLUDE)\clas
         $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \
         $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\structmember.h \
         $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h $(PY_INCLUDE)\tupleobject.h
-

diff --git a/PC/os2vacpp/makefile.omk b/PC/os2vacpp/makefile.omk
index 8a2e977be1803c70d4a6bacf90630c9365e03802..4f123c1d73ca9b4bdf0473a7f247cfeae2d39c17 100644 (file)
--- a/PC/os2vacpp/makefile.omk
+++ b/PC/os2vacpp/makefile.omk
@@ -123,7 +123,6 @@ OBJECTS             =                   \
                   FloatObject.obj   \
                   FrameObject.obj   \
                   FuncObject.obj    \
-                  IntObject.obj     \
                   ListObject.obj    \
                   LongObject.obj    \
                   MethodObject.obj  \
@@ -749,14 +748,6 @@ funcobject.obj: abstract.h ceval.h classobject.h cobject.h compile.h \
         stringobject.h structmember.h sysmodule.h traceback.h \
         tupleobject.h
 
-intobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
-        pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \
-        import.h intobject.h intrcheck.h listobject.h longobject.h \
-        methodobject.h modsupport.h moduleobject.h mymalloc.h myproto.h \
-        object.h objimpl.h pydebug.h pyerrors.h pyfpe.h pystate.h python.h \
-        pythonrun.h rangeobject.h sliceobject.h stringobject.h sysmodule.h \
-        traceback.h tupleobject.h
-
 listobject.obj: abstract.h ceval.h classobject.h cobject.h complexobject.h \
         pyconfig.h dictobject.h fileobject.h floatobject.h funcobject.h \
         import.h intobject.h intrcheck.h listobject.h longobject.h \

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 13cd9bc12c759a8a4097c2bcc49618f0efe24bf5..1f945b88bfc91008dcc43b0167157dbf5564ac69 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -601,9 +601,6 @@
                <File
                        RelativePath="..\Python\importdl.c">
                </File>
-               <File
-                       RelativePath="..\Objects\intobject.c">
-               </File>
                <File
                        RelativePath="..\Objects\iterobject.c">
                </File>

diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PCbuild8/pythoncore/pythoncore.vcproj
index f527b42a50e4ca3673bb2ac1e9abfaaacf25d0c2..457cbb0aa4bbe72bfb7af3260100b7b3b43ea581 100644 (file)
--- a/PCbuild8/pythoncore/pythoncore.vcproj
+++ b/PCbuild8/pythoncore/pythoncore.vcproj
@@ -855,10 +855,6 @@
                                RelativePath="..\..\Objects\genobject.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\Objects\intobject.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\Objects\iterobject.c"\r
                                >\r

diff --git a/RISCOS/Makefile b/RISCOS/Makefile
index 3a02248a19fcb61eab92d7a99657307808caceed..c0250f51b93a43d1ff634eef4ced638e9a4b093f 100644 (file)
--- a/RISCOS/Makefile
+++ b/RISCOS/Makefile
@@ -151,7 +151,6 @@ OBJECTS_OBJECTS =\
        @.^.Objects.o.methodobject\
        @.^.Objects.o.longobject\
        @.^.Objects.o.listobject\
-       @.^.Objects.o.intobject\
        @.^.Objects.o.boolobject\
        @.^.Objects.o.iterobject\
        @.^.Objects.o.funcobject\