Fix socket events and add input event

zooba · May 23, 2019 · Mar 14, 2019 · May 6, 2019 · May 6, 2019 · May 6, 2019
commit a96e2259f239ebd0871aeaa1fbe7e9438ab4dcee
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
@@ -747,6 +747,10 @@ are always available.  They are listed here in alphabetical order.
    If the :mod:`readline` module was loaded, then :func:`input` will use it
    to provide elaborate line editing and history features.
 
+   Raises an :func:`auditing event <sys.audit>` ``builtins.input`` with
+   argument ``prompt`` before reading input, and event ``builtins.input.result``
+   with the result after successfully reading input.
+
 
 .. class:: int([x])
            int(x, base=10)

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
@@ -527,7 +527,8 @@ The following functions all create :ref:`socket objects <socket-objects>`.
    The newly created socket is :ref:`non-inheritable <fd_inheritance>`.
 
    Creating a socket raises an :func:`auditing event <sys.audit>`
-   ``socket.__new__`` with arguments ``family``, ``type``, ``protocol``.
+   ``socket.__new__`` with arguments ``self``, ``family``, ``type``,
+   ``protocol``.
 
    .. versionchanged:: 3.3
       The AF_CAN family was added.
@@ -1108,8 +1109,8 @@ to sockets.
    Bind the socket to *address*.  The socket must not already be bound. (The format
    of *address* depends on the address family --- see above.)
 
-   Raises an :func:`auditing event <sys.audit>` ``socket.bind`` with argument
-   ``address`` as provided in the call.
+   Raises an :func:`auditing event <sys.audit>` ``socket.bind`` with arguments
+   ``self`` and ``address`` as provided in the call.
 
 .. method:: socket.close()
 
@@ -1147,8 +1148,8 @@ to sockets.
    :exc:`InterruptedError` exception if the connection is interrupted by a
    signal (or the exception raised by the signal handler).
 
-   Raises an :func:`auditing event <sys.audit>` ``socket.connect`` with argument
-   ``address`` as provided in the call.
+   Raises an :func:`auditing event <sys.audit>` ``socket.connect`` with arguments
+   ``self`` and ``address`` as provided in the call.
 
    .. versionchanged:: 3.5
       The method now waits until the connection completes instead of raising an
@@ -1166,8 +1167,8 @@ to sockets.
    :c:data:`errno` variable.  This is useful to support, for example, asynchronous
    connects.
 
-   Raises an :func:`auditing event <sys.audit>` ``socket.connect`` with argument
-   ``address`` as provided in the call.
+   Raises an :func:`auditing event <sys.audit>` ``socket.connect`` with arguments
+   ``self`` and ``address`` as provided in the call.
 
 .. method:: socket.detach()
 
@@ -1509,8 +1510,8 @@ to sockets.
    bytes sent. (The format of *address* depends on the address family --- see
    above.)
 
-   Raises an :func:`auditing event <sys.audit>` ``socket.sendto`` with argument
-   ``address`` as provided in the call.
+   Raises an :func:`auditing event <sys.audit>` ``socket.sendto`` with arguments
+   ``self`` and ``address`` as provided in the call.
 
    .. versionchanged:: 3.5
       If the system call is interrupted and the signal handler does not raise
@@ -1552,7 +1553,7 @@ to sockets.
    .. availability:: most Unix platforms, possibly others.
 
    Raises an :func:`auditing event <sys.audit>` ``socket.sendmsg`` with
-   argument ``address`` if, and only if, it was provided in the call.
+   arguments ``self`` and ``address``.
 
    .. versionadded:: 3.3
 

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
@@ -2740,6 +2740,11 @@ def test_find_through_ElementTree(self):
             it = ET.ElementTree(e).findall('//tag')
         self.assertEqual(summarize_list(it), ['tag'] * 3)
 
+    def test_find_attribute_with_empty_ns(self):
+        NS = "http://effbot.org/ns"
+        element = ET.fromstring(f"""<body xmlns="{NS}"><section id="1"/></body>""")
+        self.assertIsNotNone(element.find("t:section[@id='1']", {"":NS, "t":NS}))
+
 
 class ElementIterTest(unittest.TestCase):
     def _ilist(self, elem, tag=None):

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -4401,6 +4401,10 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args)
         }
         msg.msg_name = &addrbuf;
         msg.msg_namelen = addrlen;
+    } else {
+        if (PySys_Audit("socket.sendmsg", "OO", s, Py_None) < 0) {
+            return NULL;
+        }
     }
 
     /* Fill in an iovec for each message part, and save the Py_buffer
@@ -5055,8 +5059,8 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
     if (fdobj != NULL && fdobj != Py_None)
 #endif
     {
-        if (PySys_Audit("socket.__new__", "iii",
-                        family, type, proto) < 0) {
+        if (PySys_Audit("socket.__new__", "Oiii",
+                        s, family, type, proto) < 0) {
             return -1;
         }
     }

diff --git a/PC/layout/support/appxmanifest.py b/PC/layout/support/appxmanifest.py
@@ -71,7 +71,6 @@ def public(f):
 )
 
 APPXMANIFEST_NS = {
-    "": "http://schemas.microsoft.com/appx/manifest/foundation/windows10",
     "m": "http://schemas.microsoft.com/appx/manifest/foundation/windows10",
     "uap": "http://schemas.microsoft.com/appx/manifest/uap/windows10",
     "rescap": "http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities",
@@ -330,7 +329,7 @@ def add_application(
     suffix = "_d.exe" if ns.debug else ".exe"
     app = ET.SubElement(
         node,
-        ET.QName(APPXMANIFEST_NS[""], "Application"),
+        ET.QName(APPXMANIFEST_NS["m"], "Application"),
         {
             "Id": appid,
             "Executable": executable + suffix,

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -983,7 +983,7 @@ builtin_eval_impl(PyObject *module, PyObject *source, PyObject *globals,
 
         if (PyCode_GetNumFree((PyCodeObject *)source) > 0) {
             PyErr_SetString(PyExc_TypeError,
-        "code object passed to eval() may not contain free variables");
+                "code object passed to eval() may not contain free variables");
             return NULL;
         }
         return PyEval_EvalCode(source, globals, locals);
@@ -1217,7 +1217,7 @@ builtin_id(PyModuleDef *self, PyObject *v)
 {
     PyObject *id = PyLong_FromVoidPtr(v);
 
-    if (id && PySys_Audit("id", "O", id) < 0) {
+    if (id && PySys_Audit("builtins.id", "O", id) < 0) {
         Py_DECREF(id);
         return NULL;
     }
@@ -2001,6 +2001,10 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
         return NULL;
     }
 
+    if (PySys_Audit("builtins.input", "O", prompt ? prompt : Py_None) < 0) {
+        return NULL;
+    }
+
     /* First of all, flush stderr */
     tmp = _PyObject_CallMethodId(ferr, &PyId_flush, NULL);
     if (tmp == NULL)
@@ -2131,6 +2135,13 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
         Py_DECREF(stdin_errors);
         Py_XDECREF(po);
         PyMem_FREE(s);
+
+        if (result != NULL) {
+            if (PySys_Audit("builtins.input.result", "O", result) < 0) {
+                return NULL;
+            }
+        }
+
         return result;
 
     _readline_errors: