]> granicus.if.org Git - python/commitdiff
Issue #15984: Merge PyUnicode doc from 3.5
authorMartin Panter <vadmium+py@gmail.com>
Fri, 15 Apr 2016 02:27:11 +0000 (02:27 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Fri, 15 Apr 2016 02:27:11 +0000 (02:27 +0000)
13 files changed:
1  2 
Doc/c-api/exceptions.rst
Doc/library/logging.handlers.rst
Doc/library/os.rst
Include/bytesobject.h
Include/unicodeobject.h
Lib/test/test_codecs.py
Lib/test/test_zlib.py
Misc/NEWS
Modules/_heapqmodule.c
Modules/_pickle.c
Modules/_tracemalloc.c
Objects/codeobject.c
Objects/unicodeobject.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc Misc/NEWS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge