Skip to content

bpo-40950: Port nis module to multiphase initialization #20811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corona10 merged 9 commits into from
Jun 12, 2020
Merged

bpo-40950: Port nis module to multiphase initialization #20811

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f1d4e83
bpo-40950: Apply PEP 3121 to nis module
corona10 Jun 11, 2020
b67167c
Update Misc/NEWS.d/next/Core and Builtins/2020-06-12-00-12-28.bpo-409…
corona10 Jun 11, 2020
f3b5f82
bpo-40950: Apply Victor's review
corona10 Jun 11, 2020
8e3fda2
bpo-40950: Apply Victor's review
corona10 Jun 11, 2020
4574e0d
bpo-40950: fix
corona10 Jun 11, 2020
9e58180
bpo-40950: Apply code review
corona10 Jun 11, 2020
c1fd880
bpo-40950: nit
corona10 Jun 11, 2020
23bd00d
bpo-409501: Port nis module to multiphase initialization
corona10 Jun 11, 2020
0e6d3ea
bpo-40950: Update NEWS.d
corona10 Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2020-06-12-00-12-28.bpo-40950.tzMy7m.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Apply :pep:`3121` to :mod:`nis`. Patch by Dong-hee Na.
Comment thread
corona10 marked this conversation as resolved.
Outdated
69 changes: 53 additions & 16 deletions Modules/nismodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,48 @@ PyDoc_STRVAR(maps__doc__,
Returns an array of all available NIS maps within a domain. If domain\n\
is not specified it defaults to the system default domain.\n");

static PyObject *NisError;
typedef struct {
PyObject *NisError;
Comment thread
corona10 marked this conversation as resolved.
Outdated
} nis_state;

static inline nis_state*
get_nis_state(PyObject *module)
{
void *state = PyModule_GetState(module);
assert(state != NULL);
return (nis_state *)state;
}

static int
nis_clear(PyObject *m)
{
Py_CLEAR(get_nis_state(m)->NisError);
return 0;
}

static int
nis_traverse(PyObject *m, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(m));
Comment thread
corona10 marked this conversation as resolved.
Outdated
Py_VISIT(get_nis_state(m)->NisError);
return 0;
}

static void
nis_free(void *m)
{
nis_clear((PyObject *) m);
}

static struct PyModuleDef nismodule;

#define nis_state_global \
((nis_state *) PyModule_GetState(PyState_FindModule(&nismodule)))
Comment thread
corona10 marked this conversation as resolved.
Outdated

static PyObject *
nis_error (int err)
{
PyErr_SetString(NisError, yperr_string(err));
PyErr_SetString(nis_state_global->NisError, yperr_string(err));
return NULL;
}

Expand Down Expand Up @@ -364,12 +400,12 @@ nis_maplist (char *dom)
mapi++;
}
if (!server) {
PyErr_SetString(NisError, "No NIS master found for any map");
PyErr_SetString(nis_state_global->NisError, "No NIS master found for any map");
return NULL;
}
cl = clnt_create(server, YPPROG, YPVERS, "tcp");
if (cl == NULL) {
PyErr_SetString(NisError, clnt_spcreateerror(server));
PyErr_SetString(nis_state_global->NisError, clnt_spcreateerror(server));
goto finally;
}
list = nisproc_maplist_2 (&dom, cl);
Expand Down Expand Up @@ -444,26 +480,27 @@ PyDoc_STRVAR(nis__doc__,

static struct PyModuleDef nismodule = {
PyModuleDef_HEAD_INIT,
"nis",
nis__doc__,
-1,
nis_methods,
NULL,
NULL,
NULL,
NULL
.m_name = "nis",
.m_doc = nis__doc__,
.m_size = sizeof(nis_state),
.m_methods = nis_methods,
.m_traverse = nis_traverse,
.m_clear = nis_clear,
.m_free = nis_free,
};

PyMODINIT_FUNC
PyInit_nis(void)
{
PyObject *m, *d;
m = PyModule_Create(&nismodule);
if (m == NULL)
if (m == NULL) {
return NULL;
}
d = PyModule_GetDict(m);
Comment thread
corona10 marked this conversation as resolved.
Outdated
NisError = PyErr_NewException("nis.error", NULL, NULL);
if (NisError != NULL)
PyDict_SetItemString(d, "error", NisError);
get_nis_state(m)->NisError = PyErr_NewException("nis.error", NULL, NULL);
if (get_nis_state(m)->NisError != NULL) {
PyDict_SetItemString(d, "error", get_nis_state(m)->NisError );
}
return m;
}