summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-07 22:09:52 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-07 22:09:52 (GMT)
commit0cb85a972f45ab1c59c6f11ecb73cf9509e23225 (patch)
tree0bae8ec51a0e281f3e83bfb22cbc31cb609b70c8
parent22201221cc64029e729236ae7ac9ef1772e2cb01 (diff)
downloadcpython-0cb85a972f45ab1c59c6f11ecb73cf9509e23225.zip
cpython-0cb85a972f45ab1c59c6f11ecb73cf9509e23225.tar.gz
cpython-0cb85a972f45ab1c59c6f11ecb73cf9509e23225.tar.bz2
Remove more references to intobject.
-rw-r--r--PC/VC6/pythoncore.dsp4
-rw-r--r--PC/os2emx/Makefile3
-rw-r--r--PC/os2emx/python25.def15
-rw-r--r--PC/os2vacpp/makefile15
-rw-r--r--PC/os2vacpp/makefile.omk9
-rw-r--r--PCbuild/pythoncore.vcproj3
-rw-r--r--PCbuild8/pythoncore/pythoncore.vcproj4
-rw-r--r--RISCOS/Makefile1
8 files changed, 1 insertions, 53 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index b774ca0..02c1f35 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -431,10 +431,6 @@ SOURCE=..\..\Modules\zlib\inftrees.c
# End Source File
# Begin Source File
-SOURCE=..\..\Objects\intobject.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Objects\iterobject.c
# End Source File
# Begin Source File
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index e13a666..0761fb1 100644
--- 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 a6eb97b..ef6bd13 100644
--- 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 cf961e0..c44f42a 100644
--- 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 8a2e977..4f123c1 100644
--- 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 13cd9bc..1f945b8 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -602,9 +602,6 @@
RelativePath="..\Python\importdl.c">
</File>
<File
- RelativePath="..\Objects\intobject.c">
- </File>
- <File
RelativePath="..\Objects\iterobject.c">
</File>
<File
diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PCbuild8/pythoncore/pythoncore.vcproj
index f527b42..457cbb0 100644
--- a/PCbuild8/pythoncore/pythoncore.vcproj
+++ b/PCbuild8/pythoncore/pythoncore.vcproj
@@ -856,10 +856,6 @@
>
</File>
<File
- RelativePath="..\..\Objects\intobject.c"
- >
- </File>
- <File
RelativePath="..\..\Objects\iterobject.c"
>
</File>
diff --git a/RISCOS/Makefile b/RISCOS/Makefile
index 3a02248..c0250f5 100644
--- 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\