merge 3.3 (#16597)

diff --cc Lib/_pyio.py
Simple merge

diff --cc Lib/test/test_io.py
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc Modules/_io/bufferedio.c
index 432349a7f6370c55f897576d90610932f4a47f59,b077f34fff8c49d63031292964880d6fede7a426..ea32a5e17352252f89d1358cb51f7c5487a68c28
--- 1/Modules/_io/bufferedio.c
--- 2/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@@ -519,11 -519,22 +519,27 @@@ buffered_close(buffered *self, PyObjec
  
      res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_close, NULL);
  
 +    if (self->buffer) {
 +        PyMem_Free(self->buffer);
 +        self->buffer = NULL;
 +    }
 +
+     if (exc != NULL) {
+         if (res != NULL) {
+             Py_CLEAR(res);
+             PyErr_Restore(exc, val, tb);
+         }
+         else {
+             PyObject *val2;
+             Py_DECREF(exc);
+             Py_XDECREF(tb);
+             PyErr_Fetch(&exc, &val2, &tb);
+             PyErr_NormalizeException(&exc, &val2, &tb);
+             PyException_SetContext(val2, val);
+             PyErr_Restore(exc, val2, tb);
+         }
+     }
+ 
  end:
      LEAVE_BUFFERED(self)
      return res;

diff --cc Modules/_io/textio.c
Simple merge