@@ -103,7 +103,6 @@ static const char PyCursesVersion[] = "2.2";
103
103
#ifndef Py_BUILD_CORE_BUILTIN
104
104
# define Py_BUILD_CORE_MODULE 1
105
105
#endif
106
- #define NEEDS_PY_IDENTIFIER
107
106
108
107
#define PY_SSIZE_T_CLEAN
109
108
@@ -2177,12 +2176,11 @@ _curses_window_putwin(PyCursesWindowObject *self, PyObject *file)
2177
2176
while (1 ) {
2178
2177
char buf [BUFSIZ ];
2179
2178
Py_ssize_t n = fread (buf , 1 , BUFSIZ , fp );
2180
- _Py_IDENTIFIER (write );
2181
2179
2182
2180
if (n <= 0 )
2183
2181
break ;
2184
2182
Py_DECREF (res );
2185
- res = _PyObject_CallMethodId (file , & PyId_write , "y#" , buf , n );
2183
+ res = PyObject_CallMethod (file , "write" , "y#" , buf , n );
2186
2184
if (res == NULL )
2187
2185
break ;
2188
2186
}
@@ -3051,7 +3049,6 @@ _curses_getwin(PyObject *module, PyObject *file)
3051
3049
PyObject * data ;
3052
3050
size_t datalen ;
3053
3051
WINDOW * win ;
3054
- _Py_IDENTIFIER (read );
3055
3052
PyObject * res = NULL ;
3056
3053
3057
3054
PyCursesInitialised ;
@@ -3063,7 +3060,7 @@ _curses_getwin(PyObject *module, PyObject *file)
3063
3060
if (_Py_set_inheritable (fileno (fp ), 0 , NULL ) < 0 )
3064
3061
goto error ;
3065
3062
3066
- data = _PyObject_CallMethodIdNoArgs (file , & PyId_read );
3063
+ data = PyObject_CallMethod (file , "read" , NULL );
3067
3064
if (data == NULL )
3068
3065
goto error ;
3069
3066
if (!PyBytes_Check (data )) {
@@ -3962,8 +3959,6 @@ update_lines_cols(void)
3962
3959
{
3963
3960
PyObject * o ;
3964
3961
PyObject * m = PyImport_ImportModule ("curses" );
3965
- _Py_IDENTIFIER (LINES );
3966
- _Py_IDENTIFIER (COLS );
3967
3962
3968
3963
if (!m )
3969
3964
return 0 ;
@@ -3973,13 +3968,12 @@ update_lines_cols(void)
3973
3968
Py_DECREF (m );
3974
3969
return 0 ;
3975
3970
}
3976
- if (_PyObject_SetAttrId (m , & PyId_LINES , o )) {
3971
+ if (PyObject_SetAttrString (m , "LINES" , o )) {
3977
3972
Py_DECREF (m );
3978
3973
Py_DECREF (o );
3979
3974
return 0 ;
3980
3975
}
3981
- /* PyId_LINES.object will be initialized here. */
3982
- if (PyDict_SetItem (ModDict , _PyUnicode_FromId (& PyId_LINES ), o )) {
3976
+ if (PyDict_SetItemString (ModDict , "LINES" , o )) {
3983
3977
Py_DECREF (m );
3984
3978
Py_DECREF (o );
3985
3979
return 0 ;
@@ -3990,12 +3984,12 @@ update_lines_cols(void)
3990
3984
Py_DECREF (m );
3991
3985
return 0 ;
3992
3986
}
3993
- if (_PyObject_SetAttrId (m , & PyId_COLS , o )) {
3987
+ if (PyObject_SetAttrString (m , "COLS" , o )) {
3994
3988
Py_DECREF (m );
3995
3989
Py_DECREF (o );
3996
3990
return 0 ;
3997
3991
}
3998
- if (PyDict_SetItem (ModDict , _PyUnicode_FromId ( & PyId_COLS ) , o )) {
3992
+ if (PyDict_SetItemString (ModDict , "COLS" , o )) {
3999
3993
Py_DECREF (m );
4000
3994
Py_DECREF (o );
4001
3995
return 0 ;
0 commit comments