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

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

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)

PC/VC6/pythoncore.dsp

@@ -241,7 +241,7 @@ SOURCE=..\..\Objects\bytearrayobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Objects\bytesobject.c
+SOURCE=..\..\Objects\stringobject.c
 # End Source File
 # Begin Source File
 

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">

PC/VS8.0/pythoncore.vcproj

@@ -1379,7 +1379,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Objects\bytesobject.c"
+				RelativePath="..\..\Objects\stringobject.c"
 				>
 			</File>
 			<File

PCbuild/pythoncore.vcproj

@@ -1379,7 +1379,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Objects\bytesobject.c"
+				RelativePath="..\Objects\stringobject.c"
 				>
 			</File>
 			<File