]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3226f96 8c4e112)
Merge: #23040: Clarify treatment of encoding and errors when component is bytes.
authorR David Murray <rdmurray@bitdance.com>
Thu, 25 Dec 2014 02:24:07 +0000 (21:24 -0500)
committerR David Murray <rdmurray@bitdance.com>
Thu, 25 Dec 2014 02:24:07 +0000 (21:24 -0500)
1  2 
Doc/library/urllib.parse.rst patch | diff1 | diff2 | blob | history
Lib/urllib/parse.py patch | diff1 | diff2 | blob | history

diff --cc Doc/library/urllib.parse.rst
Simple merge
diff --cc Lib/urllib/parse.py
Simple merge
Mirror of https://github.com/python/cpython.git