ResourceWarning: Revert change on socket and scandir

io.FileIO has a safe implementation of destructor, but not socket nor scandir.

Modules/posixmodule.c

@@ -12111,7 +12111,7 @@ ScandirIterator_dealloc(ScandirIterator *iterator)
          */
         ++Py_REFCNT(iterator);
         PyErr_Fetch(&exc, &val, &tb);
-        if (PyErr_ResourceWarning((PyObject *)iterator, 1,
+        if (PyErr_WarnFormat(PyExc_ResourceWarning, 1,
                              "unclosed scandir iterator %R", iterator)) {
             /* Spurious errors can appear at shutdown */
             if (PyErr_ExceptionMatches(PyExc_Warning))

Modules/socketmodule.c

@@ -4170,7 +4170,8 @@ sock_dealloc(PySocketSockObject *s)
         Py_ssize_t old_refcount = Py_REFCNT(s);
         ++Py_REFCNT(s);
         PyErr_Fetch(&exc, &val, &tb);
-        if (PyErr_ResourceWarning(s, 1, "unclosed %R", s))
+        if (PyErr_WarnFormat(PyExc_ResourceWarning, 1,
+                             "unclosed %R", s))
             /* Spurious errors can appear at shutdown */
             if (PyErr_ExceptionMatches(PyExc_Warning))
                 PyErr_WriteUnraisable((PyObject *) s);