Skip to content

Commit 2803777

Browse files
authored
Merge branch 'main' into docs-readline-repl
2 parents 9dd8c51 + 85f3009 commit 2803777

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Doc/library/xmlrpc.client.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ ServerProxy Objects
179179
A :class:`ServerProxy` instance has a method corresponding to each remote
180180
procedure call accepted by the XML-RPC server. Calling the method performs an
181181
RPC, dispatched by both name and argument signature (e.g. the same method name
182-
can be overloaded with multiple argument signatures). The RPC finishes by
183-
returning a value, which may be either returned data in a conformant type or a
184-
:class:`Fault` or :class:`ProtocolError` object indicating an error.
182+
can be overloaded with multiple argument signatures). The RPC finishes either
183+
by returning data in a conformant type or by raising a :class:`Fault` or
184+
:class:`ProtocolError` exception indicating an error.
185185

186186
Servers that support the XML introspection API support some common methods
187187
grouped under the reserved :attr:`~ServerProxy.system` attribute:

Modules/_testmultiphase.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ PyModInit__test_from_modexport_exception(void)
10611061
}
10621062

10631063
static PyObject *
1064-
modexport_create_string(PyObject *spec, PyObject *def)
1064+
modexport_create_string(PyObject *spec, PyModuleDef *def)
10651065
{
10661066
assert(def == NULL);
10671067
return PyUnicode_FromString("is this \xf0\x9f\xa6\x8b... a module?");
@@ -1138,8 +1138,9 @@ modexport_get_empty_slots(PyObject *mod, PyObject *arg)
11381138
}
11391139

11401140
static void
1141-
modexport_smoke_free(PyObject *mod)
1141+
modexport_smoke_free(void *op)
11421142
{
1143+
PyObject *mod = (PyObject *)op;
11431144
int *state = PyModule_GetState(mod);
11441145
if (!state) {
11451146
PyErr_FormatUnraisable("Exception ignored in module %R free", mod);

0 commit comments

Comments
 (0)