Remove curses temp file consistently.

gvanrossum · gvanrossum · commit 150b7d7d02ec · 2007-08-30T23:34:01.000Z
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -1299,11 +1299,13 @@ PyCursesWindow_PutWin(PyCursesWindowObject *self, PyObject *stream)
   fp = fdopen(fd, "wb+");
   if (fp == NULL) {
     close(fd);
+    remove(fn);
     return PyErr_SetFromErrnoWithFilename(PyExc_IOError, fn);
   }
   res = PyCursesCheckERR(putwin(self->win, fp), "putwin");
   if (res == NULL) {
     fclose(fp);
+    remove(fn);
     return res;
   }
   fseek(fp, 0, 0);
@@ -1785,11 +1787,13 @@ PyCurses_GetWin(PyCursesWindowObject *self, PyObject *stream)
   fp = fdopen(fd, "wb+");
   if (fp == NULL) {
     close(fd);
+    remove(fn);
     return PyErr_SetFromErrnoWithFilename(PyExc_IOError, fn);
   }
   data = PyObject_CallMethod(stream, "read", "");
   if (data == NULL) {
     fclose(fp);
+    remove(fn);
     return NULL;
   }
   if (!PyBytes_Check(data)) {
@@ -1798,13 +1802,15 @@ PyCurses_GetWin(PyCursesWindowObject *self, PyObject *stream)
                  data->ob_type->tp_name);
     Py_DECREF(data);
     fclose(fp);
+    remove(fn);
     return NULL;
   }
   fwrite(PyBytes_AS_STRING(data), 1, PyBytes_GET_SIZE(data), fp);
   Py_DECREF(data);
   fseek(fp, 0, 0);
   win = getwin(fp);
   fclose(fp);
+  remove(fn);
   if (win == NULL) {
     PyErr_SetString(PyCursesError, catchall_NULL);
     return NULL;
