summaryrefslogtreecommitdiffstats
path: root/Misc/NEWS
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-09-16 11:45:15 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-09-16 11:45:15 (GMT)
commitf8479eeb34de987a5683af9a0c446dc35b4fd534 (patch)
tree0940fd6b20ab8dfda34104ab5636267ccfcd756d /Misc/NEWS
parent355bbb0a2ae864acd6c719b3529c6f5cabfdd950 (diff)
parentf676748a052cacdf9963aa840bfa6107275d163e (diff)
downloadcpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.zip
cpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.tar.gz
cpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.tar.bz2
Issue #25895: Merge from 3.5
Diffstat (limited to 'Misc/NEWS')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 67de797..1b5473c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
Library
-------
+- Issue #25895: Enable WebSocket URL schemes in urllib.parse.urljoin.
+ Patch by Gergely Imreh and Markus Holtermann.
+
- Issue #28114: Fix a crash in parse_envlist() when env contains byte strings.
Patch by Eryk Sun.