granicus.if.org Git - python/commit

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

projects / python / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8ca020e 20d3255)

author	Martin Panter <vadmium+py@gmail.com>
	Fri, 15 Apr 2016 02:27:11 +0000 (02:27 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Fri, 15 Apr 2016 02:27:11 +0000 (02:27 +0000)
commit	cda80940ed444d01beed797dcd86c207f11104bc
tree	7beaa1c4db9c2e8351a9cf8ddda6a656900d4275	tree \| snapshot
parent	8ca020e1cc2590472ba83611727ae20d9f34bfe5	commit \| diff
parent	20d325574eaa4f2a88036eac81e8d3cf9135372f	commit \| diff

Issue #15984: Merge PyUnicode doc from 3.5

13 files changed:

Doc/c-api/exceptions.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/logging.handlers.rst	diff1 \|	diff2 \|	blob \| history
Doc/library/os.rst	diff1 \|	diff2 \|	blob \| history
Include/bytesobject.h	diff1 \|	diff2 \|	blob \| history
Include/unicodeobject.h	diff1 \|	diff2 \|	blob \| history
Lib/test/test_codecs.py	diff1 \|	diff2 \|	blob \| history
Lib/test/test_zlib.py	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	diff1 \|	diff2 \|	blob \| history
Modules/_heapqmodule.c	diff1 \|	diff2 \|	blob \| history
Modules/_pickle.c	diff1 \|	diff2 \|	blob \| history
Modules/_tracemalloc.c	diff1 \|	diff2 \|	blob \| history
Objects/codeobject.c	diff1 \|	diff2 \|	blob \| history
Objects/unicodeobject.c	diff1 \|	diff2 \|	blob \| history

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