Issue #16473: Merge codecs doc and test from 3.4 into 3.5

author Martin Panter <vadmium>

Sat, 12 Sep 2015 01:22:17 +0000 (01:22 +0000)

committer Martin Panter <vadmium>

Sat, 12 Sep 2015 01:22:17 +0000 (01:22 +0000)
author Martin Panter <vadmium>
Sat, 12 Sep 2015 01:22:17 +0000 (01:22 +0000)
committer Martin Panter <vadmium>
Sat, 12 Sep 2015 01:22:17 +0000 (01:22 +0000)
diff --cc Doc/library/codecs.rst
Simple merge
diff --cc Lib/test/test_codecs.py
Simple merge
author	Martin Panter <vadmium>
	Sat, 12 Sep 2015 01:22:17 +0000 (01:22 +0000)
committer	Martin Panter <vadmium>
	Sat, 12 Sep 2015 01:22:17 +0000 (01:22 +0000)
		1	2
Doc/library/codecs.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_codecs.py	patch \|	diff1 \|	diff2 \|	blob \| history