granicus.if.org Git - python/commit

]> granicus.if.org Git - python/commit

author	Thomas Wouters <thomas@python.org>
	Fri, 21 Apr 2006 09:43:23 +0000 (09:43 +0000)
committer	Thomas Wouters <thomas@python.org>
	Fri, 21 Apr 2006 09:43:23 +0000 (09:43 +0000)
commit	a977329b6fb0e4c95cabb9043794de69b27a1099
tree	b91552a0578639bd10181ab612039c1bed9bec27	tree \| snapshot
parent	d858f70617a9df8456e89a898ad8f97bd57c09f9	commit \| diff

Merge part of the trunk changes into the p3yk branch. This merges from 43030
(branch-creation time) up to 43067. 43068 and 43069 contain a little
swapping action between re.py and sre.py, and this mightily confuses svn
merge, so later changes are going in separately.

This merge should break no additional tests.

The last-merged revision is going in a 'last_merge' property on '.' (the
branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I
couldn't find it, but we can easily change it afterwards ;)

116 files changed:

Doc/lib/libcodecs.tex		diff \| blob \| history
Doc/whatsnew/whatsnew25.tex		diff \| blob \| history
Include/codecs.h		diff \| blob \| history
Lib/StringIO.py		diff \| blob \| history
Lib/codecs.py		diff \| blob \| history
Lib/encodings/__init__.py		diff \| blob \| history
Lib/encodings/ascii.py		diff \| blob \| history
Lib/encodings/base64_codec.py		diff \| blob \| history
Lib/encodings/bz2_codec.py		diff \| blob \| history
Lib/encodings/charmap.py		diff \| blob \| history
Lib/encodings/cp037.py		diff \| blob \| history
Lib/encodings/cp1006.py		diff \| blob \| history
Lib/encodings/cp1026.py		diff \| blob \| history
Lib/encodings/cp1140.py		diff \| blob \| history
Lib/encodings/cp1250.py		diff \| blob \| history
Lib/encodings/cp1251.py		diff \| blob \| history
Lib/encodings/cp1252.py		diff \| blob \| history
Lib/encodings/cp1253.py		diff \| blob \| history
Lib/encodings/cp1254.py		diff \| blob \| history
Lib/encodings/cp1255.py		diff \| blob \| history
Lib/encodings/cp1256.py		diff \| blob \| history
Lib/encodings/cp1257.py		diff \| blob \| history
Lib/encodings/cp1258.py		diff \| blob \| history
Lib/encodings/cp424.py		diff \| blob \| history
Lib/encodings/cp437.py		diff \| blob \| history
Lib/encodings/cp500.py		diff \| blob \| history
Lib/encodings/cp737.py		diff \| blob \| history
Lib/encodings/cp775.py		diff \| blob \| history
Lib/encodings/cp850.py		diff \| blob \| history
Lib/encodings/cp852.py		diff \| blob \| history
Lib/encodings/cp855.py		diff \| blob \| history
Lib/encodings/cp856.py		diff \| blob \| history
Lib/encodings/cp857.py		diff \| blob \| history
Lib/encodings/cp860.py		diff \| blob \| history
Lib/encodings/cp861.py		diff \| blob \| history
Lib/encodings/cp862.py		diff \| blob \| history
Lib/encodings/cp863.py		diff \| blob \| history
Lib/encodings/cp864.py		diff \| blob \| history
Lib/encodings/cp865.py		diff \| blob \| history
Lib/encodings/cp866.py		diff \| blob \| history
Lib/encodings/cp869.py		diff \| blob \| history
Lib/encodings/cp874.py		diff \| blob \| history
Lib/encodings/cp875.py		diff \| blob \| history
Lib/encodings/hex_codec.py		diff \| blob \| history
Lib/encodings/hp_roman8.py		diff \| blob \| history
Lib/encodings/idna.py		diff \| blob \| history
Lib/encodings/iso8859_1.py		diff \| blob \| history
Lib/encodings/iso8859_10.py		diff \| blob \| history
Lib/encodings/iso8859_11.py		diff \| blob \| history
Lib/encodings/iso8859_13.py		diff \| blob \| history
Lib/encodings/iso8859_14.py		diff \| blob \| history
Lib/encodings/iso8859_15.py		diff \| blob \| history
Lib/encodings/iso8859_16.py		diff \| blob \| history
Lib/encodings/iso8859_2.py		diff \| blob \| history
Lib/encodings/iso8859_3.py		diff \| blob \| history
Lib/encodings/iso8859_4.py		diff \| blob \| history
Lib/encodings/iso8859_5.py		diff \| blob \| history
Lib/encodings/iso8859_6.py		diff \| blob \| history
Lib/encodings/iso8859_7.py		diff \| blob \| history
Lib/encodings/iso8859_8.py		diff \| blob \| history
Lib/encodings/iso8859_9.py		diff \| blob \| history
Lib/encodings/koi8_r.py		diff \| blob \| history
Lib/encodings/koi8_u.py		diff \| blob \| history
Lib/encodings/latin_1.py		diff \| blob \| history
Lib/encodings/mac_arabic.py		diff \| blob \| history
Lib/encodings/mac_centeuro.py		diff \| blob \| history
Lib/encodings/mac_croatian.py		diff \| blob \| history
Lib/encodings/mac_cyrillic.py		diff \| blob \| history
Lib/encodings/mac_farsi.py		diff \| blob \| history
Lib/encodings/mac_greek.py		diff \| blob \| history
Lib/encodings/mac_iceland.py		diff \| blob \| history
Lib/encodings/mac_latin2.py		diff \| blob \| history
Lib/encodings/mac_roman.py		diff \| blob \| history
Lib/encodings/mac_romanian.py		diff \| blob \| history
Lib/encodings/mac_turkish.py		diff \| blob \| history
Lib/encodings/mbcs.py		diff \| blob \| history
Lib/encodings/palmos.py		diff \| blob \| history
Lib/encodings/ptcp154.py		diff \| blob \| history
Lib/encodings/punycode.py		diff \| blob \| history
Lib/encodings/quopri_codec.py		diff \| blob \| history
Lib/encodings/raw_unicode_escape.py		diff \| blob \| history
Lib/encodings/rot_13.py		diff \| blob \| history
Lib/encodings/string_escape.py		diff \| blob \| history
Lib/encodings/tis_620.py		diff \| blob \| history
Lib/encodings/undefined.py		diff \| blob \| history
Lib/encodings/unicode_escape.py		diff \| blob \| history
Lib/encodings/unicode_internal.py		diff \| blob \| history
Lib/encodings/utf_16.py		diff \| blob \| history
Lib/encodings/utf_16_be.py		diff \| blob \| history
Lib/encodings/utf_16_le.py		diff \| blob \| history
Lib/encodings/utf_7.py		diff \| blob \| history
Lib/encodings/utf_8.py		diff \| blob \| history
Lib/encodings/utf_8_sig.py		diff \| blob \| history
Lib/encodings/uu_codec.py		diff \| blob \| history
Lib/encodings/zlib_codec.py		diff \| blob \| history
Lib/logging/__init__.py		diff \| blob \| history
Lib/runpy.py	[new file with mode: 0755]	blob
Lib/test/regrtest.py		diff \| blob \| history
Lib/test/test_StringIO.py		diff \| blob \| history
Lib/test/test___all__.py		diff \| blob \| history
Lib/test/test_codecs.py		diff \| blob \| history
Lib/test/test_runpy.py	[new file with mode: 0644]	blob
Lib/test/time_hashlib.py	[moved from Lib/test/test_hashlib_speed.py with 92% similarity]	diff \| blob \| history
Makefile.pre.in		diff \| blob \| history
Modules/_ctypes/_ctypes.c		diff \| blob \| history
Modules/_ctypes/cfield.c		diff \| blob \| history
Modules/_ctypes/ctypes.h		diff \| blob \| history
Modules/_testcapimodule.c		diff \| blob \| history
Modules/cStringIO.c		diff \| blob \| history
Modules/main.c		diff \| blob \| history
Modules/xxmodule.c		diff \| blob \| history
Objects/obmalloc.c		diff \| blob \| history
Python/codecs.c		diff \| blob \| history
Tools/buildbot/clean.bat		diff \| blob \| history
Tools/unicode/Makefile		diff \| blob \| history
Tools/unicode/gencodec.py		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom