diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-10 21:23:22 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-06-10 21:23:22 (GMT) |
| commit | b7fea62ccaf10364047e8fc39005fafec7ad5975 (patch) | |
| tree | c039f1bc27af755829426c09090b6995e5b5904a | |
| parent | 482f31299c3512a2033c48c92ae1d055c038824c (diff) | |
| download | cpython-b7fea62ccaf10364047e8fc39005fafec7ad5975.zip cpython-b7fea62ccaf10364047e8fc39005fafec7ad5975.tar.gz cpython-b7fea62ccaf10364047e8fc39005fafec7ad5975.tar.bz2 | |
Rename bytesobject.c back to stringobject.c to keep with the PyString theme.
Part of reverting most of r63675 per the mailing list discussion.
| -rw-r--r-- | Makefile.pre.in | 6 | ||||
| -rw-r--r-- | Objects/stringobject.c (renamed from Objects/bytesobject.c) | 0 | ||||
| -rw-r--r-- | PC/VC6/pythoncore.dsp | 2 | ||||
| -rw-r--r-- | PC/VS7.1/pythoncore.vcproj | 2 | ||||
| -rw-r--r-- | PC/VS8.0/pythoncore.vcproj | 2 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 94e937c..c7b72f5 100644 --- 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 index 793cc88..793cc88 100644 --- a/Objects/bytesobject.c +++ b/Objects/stringobject.c diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index 24641b1..992f816 100644 --- a/PC/VC6/pythoncore.dsp +++ b/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
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj index a79de8d..e541ca6 100644 --- 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 d6bb6b6..3f99a62 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -1379,7 +1379,7 @@ >
</File>
<File
- RelativePath="..\..\Objects\bytesobject.c"
+ RelativePath="..\..\Objects\stringobject.c"
>
</File>
<File
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index a55f864..70d8724 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -1379,7 +1379,7 @@ > </File> <File - RelativePath="..\Objects\bytesobject.c" + RelativePath="..\Objects\stringobject.c" > </File> <File |