Rename bytesobject.c back to stringobject.c to keep with the PyString theme.

Part of reverting most of r63675 per the mailing list discussion.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 94e937c4b833c935fa2008616c5b7951ce7a9036..c7b72f5e44645cf07b89e6fde83499f3932ac53f 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -303,7 +303,6 @@ OBJECT_OBJS=        \
                Objects/bufferobject.o \
                Objects/bytes_methods.o \
                Objects/bytearrayobject.o \
-               Objects/bytesobject.o \
                Objects/cellobject.o \
                Objects/classobject.o \
                Objects/cobject.o \
@@ -327,8 +326,9 @@ OBJECT_OBJS=        \
                Objects/object.o \
                Objects/obmalloc.o \
                Objects/rangeobject.o \
-                Objects/setobject.o \
+               Objects/setobject.o \
                Objects/sliceobject.o \
+               Objects/stringobject.o \
                Objects/structseq.o \
                Objects/tupleobject.o \
                Objects/typeobject.o \
@@ -563,8 +563,6 @@ Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c \
 
 Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
                                $(STRINGLIB_HEADERS)
-Objects/bytesobject.o: $(srcdir)/Objects/bytesobject.c \
-                               $(STRINGLIB_HEADERS)
 
 Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
                                $(STRINGLIB_HEADERS)

diff --git a/Objects/bytesobject.c b/Objects/stringobject.c
similarity index 100%
rename from Objects/bytesobject.c
rename to Objects/stringobject.c

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 24641b1f8b1df5da59062bcf5b66d19b76ef6ec2..992f816a47dc228e03344579f0c2b7403d422b38 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -241,7 +241,7 @@ SOURCE=..\..\Objects\bytearrayobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Objects\bytesobject.c\r
+SOURCE=..\..\Objects\stringobject.c\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index a79de8d786296d94013338bf3d927d0bf1a51ef6..e541ca613e1956783443e2bc4f1f9c0fdbdee72e 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -446,7 +446,7 @@
                        RelativePath="..\..\Objects\bytearrayobject.c">
                </File>
                <File
-                       RelativePath="..\..\Objects\bytesobject.c">
+                       RelativePath="..\..\Objects\stringobject.c">
                </File>
                <File
                        RelativePath="..\..\Objects\bytes_methods.c">

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index d6bb6b61cffabc9413fa854ba16ac8e475436ded..3f99a629769bc56537a3fa6e0b6557ff6d060fa6 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1379,7 +1379,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Objects\bytesobject.c"\r
+                               RelativePath="..\..\Objects\stringobject.c"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index a55f864d53c87a975780f904add1138647bd87a7..70d87241f3bc6d124babfed336c6451a113a9e4a 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1379,7 +1379,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\Objects\bytesobject.c"
+                               RelativePath="..\Objects\stringobject.c"
                                >
                        </File>
                        <File