Skip to content

Commit b7fea62

Browse files
gpsheadgpshead
committed
Rename bytesobject.c back to stringobject.c to keep with the PyString theme.
Part of reverting most of r63675 per the mailing list discussion.
1 parent 482f312 commit b7fea62

6 files changed

Lines changed: 6 additions & 8 deletions

File tree

‎Makefile.pre.in‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ OBJECT_OBJS= \
303303
Objects/bufferobject.o \
304304
Objects/bytes_methods.o \
305305
Objects/bytearrayobject.o \
306-
Objects/bytesobject.o \
307306
Objects/cellobject.o \
308307
Objects/classobject.o \
309308
Objects/cobject.o \
@@ -327,8 +326,9 @@ OBJECT_OBJS= \
327326
Objects/object.o \
328327
Objects/obmalloc.o \
329328
Objects/rangeobject.o \
330-
Objects/setobject.o \
329+
Objects/setobject.o \
331330
Objects/sliceobject.o \
331+
Objects/stringobject.o \
332332
Objects/structseq.o \
333333
Objects/tupleobject.o \
334334
Objects/typeobject.o \
@@ -563,8 +563,6 @@ Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c \
563563

564564
Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
565565
$(STRINGLIB_HEADERS)
566-
Objects/bytesobject.o: $(srcdir)/Objects/bytesobject.c \
567-
$(STRINGLIB_HEADERS)
568566

569567
Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
570568
$(STRINGLIB_HEADERS)

Objects/bytesobject.c renamed to Objects/stringobject.c

File renamed without changes.

‎PC/VC6/pythoncore.dsp‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PC/VS7.1/pythoncore.vcproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@
446446
RelativePath="..\..\Objects\bytearrayobject.c">
447447
</File>
448448
<File
449-
RelativePath="..\..\Objects\bytesobject.c">
449+
RelativePath="..\..\Objects\stringobject.c">
450450
</File>
451451
<File
452452
RelativePath="..\..\Objects\bytes_methods.c">

‎PC/VS8.0/pythoncore.vcproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@
13791379
>
13801380
</File>
13811381
<File
1382-
RelativePath="..\..\Objects\bytesobject.c"
1382+
RelativePath="..\..\Objects\stringobject.c"
13831383
>
13841384
</File>
13851385
<File

‎PCbuild/pythoncore.vcproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@
13791379
>
13801380
</File>
13811381
<File
1382-
RelativePath="..\Objects\bytesobject.c"
1382+
RelativePath="..\Objects\stringobject.c"
13831383
>
13841384
</File>
13851385
<File

0 commit comments

Comments
 (0)