Issue #8035: urllib: Fix a bug where the client could remain stuck after a

redirection or an error.

diff --cc Lib/urllib/request.py
Simple merge

diff --cc Misc/NEWS
index 286192ce72f87c9c1e43abeb3ebbe0cddf7e16c3,72b33b99f3bd638a462fd9fa4c6f6d54ab6de3d6..85667cc4d31949d3122898a77cccfb7a19b5c6b7
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -419,17 -97,9 +419,20 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #8035: urllib: Fix a bug where the client could remain stuck after a
+   redirection or an error.
+ 
 +- Issue #13560: os.strerror() now uses the current locale encoding instead of
 +  UTF-8.
 +
 +- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize()
 +  and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to
 +  the current locale encoding.
 +
 +- Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem
 +  encoding and the surrogateescape error handler, rather than UTF-8.  Patch
 +  by David Watson.
 +
  - Issue #10350: Read and save errno before calling a function which might
    overwrite it.  Original patch by Hallvard B Furuseth.