python3: Sort all method/property lists

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2013-11-27 11:59:16 -05:00
parent df9e22ea54
commit d7de719ca1

View File

@ -1102,12 +1102,37 @@ static PyGetSetDef Container_getseters[] = {
}; };
static PyMethodDef Container_methods[] = { static PyMethodDef Container_methods[] = {
{"attach", (PyCFunction)Container_attach,
METH_VARARGS|METH_KEYWORDS,
"attach(run, payload) -> int\n"
"\n"
"Attach to the container. Returns the pid of the attached process."
},
{"attach_wait", (PyCFunction)Container_attach_wait,
METH_VARARGS|METH_KEYWORDS,
"attach(run, payload) -> int\n"
"\n"
"Attach to the container. Returns the exit code of the process."
},
{"clear_config_item", (PyCFunction)Container_clear_config_item, {"clear_config_item", (PyCFunction)Container_clear_config_item,
METH_VARARGS|METH_KEYWORDS, METH_VARARGS|METH_KEYWORDS,
"clear_config_item(key) -> boolean\n" "clear_config_item(key) -> boolean\n"
"\n" "\n"
"Clear the current value of a config key." "Clear the current value of a config key."
}, },
{"console", (PyCFunction)Container_console,
METH_VARARGS|METH_KEYWORDS,
"console(ttynum = -1, stdinfd = 0, stdoutfd = 1, stderrfd = 2, "
"escape = 0) -> boolean\n"
"\n"
"Attach to container's console."
},
{"console_getfd", (PyCFunction)Container_console_getfd,
METH_VARARGS|METH_KEYWORDS,
"console(ttynum = -1) -> boolean\n"
"\n"
"Attach to container's console."
},
{"create", (PyCFunction)Container_create, {"create", (PyCFunction)Container_create,
METH_VARARGS|METH_KEYWORDS, METH_VARARGS|METH_KEYWORDS,
"create(template, args = (,)) -> boolean\n" "create(template, args = (,)) -> boolean\n"
@ -1228,31 +1253,6 @@ static PyMethodDef Container_methods[] = {
"\n" "\n"
"Wait for the container to reach a given state or timeout." "Wait for the container to reach a given state or timeout."
}, },
{"console", (PyCFunction)Container_console,
METH_VARARGS|METH_KEYWORDS,
"console(ttynum = -1, stdinfd = 0, stdoutfd = 1, stderrfd = 2, "
"escape = 0) -> boolean\n"
"\n"
"Attach to container's console."
},
{"console_getfd", (PyCFunction)Container_console_getfd,
METH_VARARGS|METH_KEYWORDS,
"console(ttynum = -1) -> boolean\n"
"\n"
"Attach to container's console."
},
{"attach", (PyCFunction)Container_attach,
METH_VARARGS|METH_KEYWORDS,
"attach(run, payload) -> int\n"
"\n"
"Attach to the container. Returns the pid of the attached process."
},
{"attach_wait", (PyCFunction)Container_attach_wait,
METH_VARARGS|METH_KEYWORDS,
"attach(run, payload) -> int\n"
"\n"
"Attach to the container. Returns the exit code of the process."
},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };
@ -1299,14 +1299,14 @@ PyVarObject_HEAD_INIT(NULL, 0)
}; };
static PyMethodDef LXC_methods[] = { static PyMethodDef LXC_methods[] = {
{"attach_run_shell", (PyCFunction)LXC_attach_run_shell, METH_O, {"arch_to_personality", (PyCFunction)LXC_arch_to_personality, METH_O,
"Starts up a shell when attaching, to use as the run parameter for " "Returns the process personality of the corresponding architecture"},
"attach or attach_wait"},
{"attach_run_command", (PyCFunction)LXC_attach_run_command, METH_O, {"attach_run_command", (PyCFunction)LXC_attach_run_command, METH_O,
"Runs a command when attaching, to use as the run parameter for attach " "Runs a command when attaching, to use as the run parameter for attach "
"or attach_wait"}, "or attach_wait"},
{"arch_to_personality", (PyCFunction)LXC_arch_to_personality, METH_O, {"attach_run_shell", (PyCFunction)LXC_attach_run_shell, METH_O,
"Returns the process personality of the corresponding architecture"}, "Starts up a shell when attaching, to use as the run parameter for "
"attach or attach_wait"},
{"get_default_config_path", (PyCFunction)LXC_get_default_config_path, {"get_default_config_path", (PyCFunction)LXC_get_default_config_path,
METH_NOARGS, METH_NOARGS,
"Returns the current LXC config path"}, "Returns the current LXC config path"},