GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-103092: Prep curses module for multi-phase init by koubaa · Pull Request #23091 · python/cpython

gh-103092: Prep curses module for multi-phase init #23091

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

Closed
koubaa wants to merge 3 commits into python:main from koubaa:bpo-1635741-curses-prep

Uh oh!

There was an error while loading. Please reload this page.
Closed

gh-103092: Prep curses module for multi-phase init #23091

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab3c3f3
Prep curses module for multi-phase init
koubaa Nov 2, 2020
ddfb744
fix issues with CI
koubaa Nov 3, 2020
0dc705b
remove PyImport_ImportModuleNoBlock
koubaa Nov 7, 2020
File filter
Filter by extension
Clear filters
Conversations
Failed to load comments.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Diff view
Diff view

There are no files selected for viewing

163 changes: 99 additions & 64 deletions 163 Modules/_cursesmodule.c
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3235,8 +3235,6 @@ _curses_init_pair_impl(PyObject *module, int pair_number, int fg, int bg)
Py_RETURN_NONE;
}

static PyObject *ModDict;

/*[clinic input]
_curses.initscr

Expand All @@ -3252,6 +3250,11 @@ _curses_initscr_impl(PyObject *module)
WINDOW *win;
PyCursesWindowObject *winobj;

PyObject *d = PyModule_GetDict(module);
if (d == NULL) {
return NULL;
}

if (initialised) {
wrefresh(stdscr);
return (PyObject *)PyCursesWindow_New(stdscr, NULL);
Expand All @@ -3271,9 +3274,14 @@ _curses_initscr_impl(PyObject *module)
#define SetDictInt(string,ch) \
do { \
PyObject *o = PyLong_FromLong((long) (ch)); \
if (o && PyDict_SetItemString(ModDict, string, o) == 0) { \
if (o == NULL) { \
goto error; \
} \
if (PyDict_SetItemString(d, string, o) < 0) { \
Py_DECREF(o); \
goto error; \
Comment thread

@vstinner vstinner Mar 11, 2021

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"return NULL;" is enough: you should remove the error label. An error label is used when you need to clean up things, it's not the case here. Same remark at the bottom of the file.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
} \
Py_DECREF(o); \
} while (0)

/* Here are some graphic symbols you can use */
Expand Down Expand Up @@ -3349,6 +3357,9 @@ _curses_initscr_impl(PyObject *module)
winobj = (PyCursesWindowObject *)PyCursesWindow_New(win, NULL);
screen_encoding = winobj->encoding;
return (PyObject *)winobj;

error:
return NULL;
}

/*[clinic input]
Expand Down Expand Up @@ -3952,50 +3963,43 @@ _curses_qiflush_impl(PyObject *module, int flag)
* and _curses.COLS */
#if defined(HAVE_CURSES_RESIZETERM) || defined(HAVE_CURSES_RESIZE_TERM)
static int
update_lines_cols(void)
update_lines_cols(PyObject *module)
{
PyObject *o;
PyObject *m = PyImport_ImportModuleNoBlock("curses");
_Py_IDENTIFIER(LINES);
_Py_IDENTIFIER(COLS);

if (!m)
PyObject *d = PyModule_GetDict(module);
if (d == NULL) {
return 0;
}

o = PyLong_FromLong(LINES);
PyObject *o = PyLong_FromLong(LINES);
if (!o) {
Py_DECREF(m);
return 0;
}
if (_PyObject_SetAttrId(m, &PyId_LINES, o)) {
Py_DECREF(m);
if (_PyObject_SetAttrId(module, &PyId_LINES, o)) {
Py_DECREF(o);
return 0;
}
/* PyId_LINES.object will be initialized here. */
if (PyDict_SetItem(ModDict, _PyUnicode_FromId(&PyId_LINES), o)) {
Py_DECREF(m);
if (PyDict_SetItem(d, _PyUnicode_FromId(&PyId_LINES), o)) {
Py_DECREF(o);
return 0;
}
Py_DECREF(o);
o = PyLong_FromLong(COLS);
if (!o) {
Py_DECREF(m);
return 0;
}
if (_PyObject_SetAttrId(m, &PyId_COLS, o)) {
Py_DECREF(m);
if (_PyObject_SetAttrId(module, &PyId_COLS, o)) {
Py_DECREF(o);
return 0;
}
if (PyDict_SetItem(ModDict, _PyUnicode_FromId(&PyId_COLS), o)) {
Py_DECREF(m);
if (PyDict_SetItem(d, _PyUnicode_FromId(&PyId_COLS), o)) {
Py_DECREF(o);
return 0;
}
Py_DECREF(o);
Py_DECREF(m);
return 1;
}

Expand All @@ -4008,7 +4012,7 @@ static PyObject *
_curses_update_lines_cols_impl(PyObject *module)
/*[clinic end generated code: output=423f2b1e63ed0f75 input=5f065ab7a28a5d90]*/
{
if (!update_lines_cols()) {
if (!update_lines_cols(module)) {
return NULL;
}
Py_RETURN_NONE;
Expand Down Expand Up @@ -4095,7 +4099,7 @@ _curses_resizeterm_impl(PyObject *module, int nlines, int ncols)
result = PyCursesCheckERR(resizeterm(nlines, ncols), "resizeterm");
if (!result)
return NULL;
if (!update_lines_cols()) {
if (!update_lines_cols(module)) {
Py_DECREF(result);
return NULL;
}
Expand Down Expand Up @@ -4134,7 +4138,7 @@ _curses_resize_term_impl(PyObject *module, int nlines, int ncols)
result = PyCursesCheckERR(resize_term(nlines, ncols), "resize_term");
if (!result)
return NULL;
if (!update_lines_cols()) {
if (!update_lines_cols(module)) {
Py_DECREF(result);
return NULL;
}
Expand Down Expand Up @@ -4197,26 +4201,28 @@ static PyObject *
_curses_start_color_impl(PyObject *module)
/*[clinic end generated code: output=8b772b41d8090ede input=0ca0ecb2b77e1a12]*/
{
int code;
PyObject *c, *cp;

PyCursesInitialised;

code = start_color();
PyObject *d = PyModule_GetDict(module);
if (d == NULL) {
return NULL;
}

int code = start_color();
if (code != ERR) {
initialisedcolors = TRUE;
c = PyLong_FromLong((long) COLORS);
PyObject *c = PyLong_FromLong((long) COLORS);
if (c == NULL)
return NULL;
if (PyDict_SetItemString(ModDict, "COLORS", c) < 0) {
if (PyDict_SetItemString(d, "COLORS", c) < 0) {
Py_DECREF(c);
return NULL;
}
Py_DECREF(c);
cp = PyLong_FromLong((long) COLOR_PAIRS);
PyObject *cp = PyLong_FromLong((long) COLOR_PAIRS);
if (cp == NULL)
return NULL;
if (PyDict_SetItemString(ModDict, "COLOR_PAIRS", cp) < 0) {
if (PyDict_SetItemString(d, "COLOR_PAIRS", cp) < 0) {
Py_DECREF(cp);
return NULL;
}
Expand Down Expand Up @@ -4717,14 +4723,14 @@ static PyMethodDef PyCurses_methods[] = {

static struct PyModuleDef _cursesmodule = {
PyModuleDef_HEAD_INIT,
"_curses",
NULL,
-1,
PyCurses_methods,
NULL,
NULL,
NULL,
NULL
.m_name = "_curses",
.m_doc = NULL,
.m_size = -1,
.m_methods = PyCurses_methods,
.m_slots = NULL,
Comment thread
koubaa marked this conversation as resolved.
Resolved

Uh oh!

There was an error while loading. Please reload this page.
.m_traverse = NULL,
.m_clear = NULL,
.m_free = NULL
};

static void
Expand All @@ -4738,22 +4744,24 @@ curses_destructor(PyObject *op)
PyMODINIT_FUNC
PyInit__curses(void)
{
PyObject *m, *d, *v, *c_api_object;

/* Initialize object type */
if (PyType_Ready(&PyCursesWindow_Type) < 0)
if (PyType_Ready(&PyCursesWindow_Type) < 0) {
return NULL;
}

static void *PyCurses_API[PyCurses_API_pointers];
Comment thread

@vstinner vstinner Mar 11, 2021

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are warnings on the PR, like ‘PyCurses_API’ defined but not used [-Wunused-variable].

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions

/* Create the module and add the functions */
m = PyModule_Create(&_cursesmodule);
if (m == NULL)
PyObject *m = PyModule_Create(&_cursesmodule);
if (m == NULL) {
return NULL;
}

/* Add some symbolic constants to the module */
d = PyModule_GetDict(m);
if (d == NULL)
PyObject *d = PyModule_GetDict(m);
if (d == NULL) {
return NULL;
ModDict = d; /* For PyCurses_InitScr to use later */
}

void **PyCurses_API = PyMem_Calloc(PyCurses_API_pointers, sizeof(void *));
if (PyCurses_API == NULL) {
Expand All @@ -4767,6 +4775,7 @@ PyInit__curses(void)
PyCurses_API[3] = (void *)func_PyCursesInitialisedColor;

/* Add a capsule for the C API */
PyObject *c_api_object;
c_api_object = PyCapsule_New(PyCurses_API, PyCurses_CAPSULE_NAME,
curses_destructor);
if (c_api_object == NULL) {
Expand All @@ -4782,12 +4791,29 @@ PyInit__curses(void)

/* For exception curses.error */
PyCursesError = PyErr_NewException("_curses.error", NULL, NULL);
PyDict_SetItemString(d, "error", PyCursesError);
if (PyCursesError == NULL) {
return NULL;
}

if (PyDict_SetItemString(d, "error", PyCursesError) < 0) {
Py_DECREF(PyCursesError);
return NULL;
}

/* Make the version available */
v = PyBytes_FromString(PyCursesVersion);
PyDict_SetItemString(d, "version", v);
PyDict_SetItemString(d, "__version__", v);
PyObject *v = PyBytes_FromString(PyCursesVersion);
if (v == NULL) {
return NULL;
}

if (PyDict_SetItemString(d, "version", v) < 0) {
Py_DECREF(v);
return NULL;
}
if (PyDict_SetItemString(d, "__version__", v) < 0) {
Py_DECREF(v);
return NULL;
}
Py_DECREF(v);

#ifdef NCURSES_VERSION
Expand All @@ -4801,15 +4827,17 @@ PyInit__curses(void)
if (v == NULL) {
return NULL;
}
PyDict_SetItemString(d, "ncurses_version", v);
if (PyDict_SetItemString(d, "ncurses_version", v) < 0) {
Py_DECREF(v);
return NULL;
}
Py_DECREF(v);

/* prevent user from creating new instances */
NcursesVersionType.tp_init = NULL;
NcursesVersionType.tp_new = NULL;
if (PyDict_DelItemString(NcursesVersionType.tp_dict, "__new__") < 0 &&
PyErr_ExceptionMatches(PyExc_KeyError))
{
PyErr_ExceptionMatches(PyExc_KeyError)) {
PyErr_Clear();
}
#endif /* NCURSES_VERSION */
Expand All @@ -4820,14 +4848,14 @@ PyInit__curses(void)
/* Here are some attributes you can add to chars to print */

SetDictInt("A_ATTRIBUTES", A_ATTRIBUTES);
SetDictInt("A_NORMAL", A_NORMAL);
SetDictInt("A_STANDOUT", A_STANDOUT);
SetDictInt("A_UNDERLINE", A_UNDERLINE);
SetDictInt("A_REVERSE", A_REVERSE);
SetDictInt("A_BLINK", A_BLINK);
SetDictInt("A_DIM", A_DIM);
SetDictInt("A_BOLD", A_BOLD);
SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
SetDictInt("A_NORMAL", A_NORMAL);
SetDictInt("A_STANDOUT", A_STANDOUT);
SetDictInt("A_UNDERLINE", A_UNDERLINE);
SetDictInt("A_REVERSE", A_REVERSE);
SetDictInt("A_BLINK", A_BLINK);
SetDictInt("A_DIM", A_DIM);
SetDictInt("A_BOLD", A_BOLD);
SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
SetDictInt("A_INVIS", A_INVIS);
SetDictInt("A_PROTECT", A_PROTECT);
SetDictInt("A_CHARTEXT", A_CHARTEXT);
Expand Down Expand Up @@ -4915,8 +4943,9 @@ PyInit__curses(void)
char *key_n2;
for (key=KEY_MIN;key < KEY_MAX; key++) {
key_n = (char *)keyname(key);
if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0) {
continue;
}
if (strncmp(key_n,"KEY_F(",6)==0) {
char *p1, *p2;
key_n2 = PyMem_Malloc(strlen(key_n)+1);
Expand All @@ -4934,11 +4963,14 @@ PyInit__curses(void)
p1++;
}
*p2 = (char)0;
} else
}
else {
key_n2 = key_n;
}
SetDictInt(key_n2,key);
if (key_n2 != key_n)
if (key_n2 != key_n) {
PyMem_Free(key_n2);
}
}
SetDictInt("KEY_MIN", KEY_MIN);
SetDictInt("KEY_MAX", KEY_MAX);
Expand All @@ -4948,4 +4980,7 @@ PyInit__curses(void)
return NULL;
}
return m;

error:
return NULL;
}
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.