]> granicus.if.org Git - python/commit
Merging the py3k-pep3137 branch back into the py3k branch.
authorGuido van Rossum <guido@python.org>
Tue, 6 Nov 2007 21:34:58 +0000 (21:34 +0000)
committerGuido van Rossum <guido@python.org>
Tue, 6 Nov 2007 21:34:58 +0000 (21:34 +0000)
commit98297ee7815939b124156e438b22bd652d67b5db
treea9d239ebd87c73af2571ab48003984c4e18e27e5
parenta19f80c6df2df5e8a5d0cff37131097835ef971e
Merging the py3k-pep3137 branch back into the py3k branch.
No detailed change log; just check out the change log for the py3k-pep3137
branch.  The most obvious changes:

  - str8 renamed to bytes (PyString at the C level);
  - bytes renamed to buffer (PyBytes at the C level);
  - PyString and PyUnicode are no longer compatible.

I.e. we now have an immutable bytes type and a mutable bytes type.

The behavior of PyString was modified quite a bit, to make it more
bytes-like.  Some changes are still on the to-do list.
148 files changed:
Doc/library/array.rst
Doc/library/exceptions.rst
Doc/library/functions.rst
Doc/library/stdtypes.rst
Doc/library/warnings.rst
Doc/whatsnew/3.0.rst
Include/abstract.h
Include/object.h
Include/opcode.h
Include/pydebug.h
Include/pyerrors.h
Include/stringobject.h
Lib/_abcoll.py
Lib/base64.py
Lib/copy.py
Lib/ctypes/test/test_array_in_pointer.py
Lib/ctypes/test/test_byteswap.py
Lib/ctypes/test/test_slicing.py
Lib/dumbdbm.py
Lib/email/base64mime.py
Lib/email/test/test_email.py
Lib/encodings/__init__.py
Lib/encodings/idna.py
Lib/encodings/punycode.py
Lib/gettext.py
Lib/httplib.py
Lib/idlelib/OutputWindow.py
Lib/io.py
Lib/mailbox.py
Lib/modulefinder.py
Lib/pickle.py
Lib/pickletools.py
Lib/plat-mac/aepack.py
Lib/plat-mac/aetypes.py
Lib/plat-mac/plistlib.py
Lib/sqlite3/dbapi2.py
Lib/sqlite3/test/factory.py
Lib/sqlite3/test/types.py
Lib/sqlite3/test/userfunctions.py
Lib/sre_parse.py
Lib/string.py
Lib/struct.py
Lib/subprocess.py
Lib/tarfile.py
Lib/tempfile.py
Lib/test/buffer_tests.py
Lib/test/exception_hierarchy.txt
Lib/test/pickletester.py
Lib/test/regrtest.py
Lib/test/string_tests.py
Lib/test/test_asynchat.py
Lib/test/test_asyncore.py
Lib/test/test_audioop.py
Lib/test/test_binascii.py
Lib/test/test_builtin.py
Lib/test/test_bytes.py
Lib/test/test_bz2.py
Lib/test/test_codeccallbacks.py
Lib/test/test_codecs.py
Lib/test/test_collections.py
Lib/test/test_compile.py
Lib/test/test_datetime.py
Lib/test/test_descr.py
Lib/test/test_dumbdbm.py
Lib/test/test_exceptions.py
Lib/test/test_float.py
Lib/test/test_httplib.py
Lib/test/test_io.py
Lib/test/test_mailbox.py
Lib/test/test_marshal.py
Lib/test/test_mmap.py
Lib/test/test_multibytecodec_support.py
Lib/test/test_pickle.py
Lib/test/test_posix.py
Lib/test/test_struct.py
Lib/test/test_subprocess.py
Lib/test/test_sys.py
Lib/test/test_unicode.py
Lib/test/test_unicodedata.py
Lib/test/test_urllib2.py
Lib/test/test_xml_etree.py
Lib/test/test_xml_etree_c.py
Lib/test/test_zipimport.py
Lib/test/testcodec.py
Lib/urllib.py
Lib/urllib2.py
Lib/uuid.py
Lib/xmlrpclib.py
Lib/zipfile.py
Mac/Modules/ae/_AEmodule.c
Misc/ACKS
Misc/NEWS
Modules/_bsddb.c
Modules/_codecsmodule.c
Modules/_ctypes/_ctypes.c
Modules/_ctypes/callproc.c
Modules/_ctypes/cfield.c
Modules/_cursesmodule.c
Modules/_fileio.c
Modules/_hashopenssl.c
Modules/_sqlite/cache.c
Modules/_sqlite/connection.c
Modules/_sqlite/cursor.c
Modules/_sqlite/module.c
Modules/_sqlite/row.c
Modules/_sqlite/statement.c
Modules/_struct.c
Modules/arraymodule.c
Modules/binascii.c
Modules/bz2module.c
Modules/cjkcodecs/multibytecodec.c
Modules/datetimemodule.c
Modules/dbmmodule.c
Modules/gdbmmodule.c
Modules/main.c
Modules/md5module.c
Modules/mmapmodule.c
Modules/posixmodule.c
Modules/pyexpat.c
Modules/sha1module.c
Modules/sha256module.c
Modules/sha512module.c
Modules/socketmodule.c
Objects/abstract.c
Objects/bytesobject.c
Objects/codeobject.c
Objects/exceptions.c
Objects/fileobject.c
Objects/longobject.c
Objects/moduleobject.c
Objects/object.c
Objects/stringlib/transmogrify.h
Objects/stringobject.c
Objects/typeobject.c
Objects/unicodeobject.c
Parser/tokenizer.c
Python/ast.c
Python/bltinmodule.c
Python/ceval.c
Python/codecs.c
Python/compile.c
Python/getargs.c
Python/import.c
Python/mactoolboxglue.c
Python/marshal.c
Python/modsupport.c
Python/pythonrun.c
Python/sysmodule.c