https://github.com/python/cpython/commit/99490913a08adcf2fe5e69b82772a829ec462275
commit: 99490913a08adcf2fe5e69b82772a829ec462275
branch: main
author: Peter Bierma <zintensity...@gmail.com>
committer: erlend-aasland <erlend.aasl...@protonmail.com>
date: 2024-11-29T11:12:13+01:00
summary:
gh-127341: Argument Clinic: fix compiler warnings for getters with docstrings
(#127310)
Co-authored-by: Erlend E. Aasland <erl...@python.org>
files:
M Lib/test/clinic.test.c
M Modules/_io/clinic/bufferedio.c.h
M Modules/_io/clinic/stringio.c.h
M Modules/_io/clinic/textio.c.h
M Modules/clinic/_ssl.c.h
M Tools/clinic/libclinic/parse_args.py
diff --git a/Lib/test/clinic.test.c b/Lib/test/clinic.test.c
index 4ad0b8b0910bbe..b6ae04ecf2f8ed 100644
--- a/Lib/test/clinic.test.c
+++ b/Lib/test/clinic.test.c
@@ -5303,9 +5303,7 @@ Test_meth_coexist_impl(TestObj *self)
Test.property
[clinic start generated code]*/
-#if defined(Test_property_HAS_DOCSTR)
-# define Test_property_DOCSTR Test_property__doc__
-#else
+#if !defined(Test_property_DOCSTR)
# define Test_property_DOCSTR NULL
#endif
#if defined(TEST_PROPERTY_GETSETDEF)
@@ -5326,16 +5324,14 @@ Test_property_get(TestObj *self, void
*Py_UNUSED(context))
static PyObject *
Test_property_get_impl(TestObj *self)
-/*[clinic end generated code: output=27b519719d992e03 input=2d92b3449fbc7d2b]*/
+/*[clinic end generated code: output=7cadd0f539805266 input=2d92b3449fbc7d2b]*/
/*[clinic input]
@setter
Test.property
[clinic start generated code]*/
-#if defined(TEST_PROPERTY_HAS_DOCSTR)
-# define Test_property_DOCSTR Test_property__doc__
-#else
+#if !defined(Test_property_DOCSTR)
# define Test_property_DOCSTR NULL
#endif
#if defined(TEST_PROPERTY_GETSETDEF)
@@ -5360,7 +5356,7 @@ Test_property_set(TestObj *self, PyObject *value, void
*Py_UNUSED(context))
static int
Test_property_set_impl(TestObj *self, PyObject *value)
-/*[clinic end generated code: output=d51023f17c4ac3a1 input=3bc3f46a23c83a88]*/
+/*[clinic end generated code: output=e4342fe9bb1d7817 input=3bc3f46a23c83a88]*/
/*[clinic input]
output push
diff --git a/Modules/_io/clinic/bufferedio.c.h
b/Modules/_io/clinic/bufferedio.c.h
index b703d7e6855398..e035bd99baca5f 100644
--- a/Modules/_io/clinic/bufferedio.c.h
+++ b/Modules/_io/clinic/bufferedio.c.h
@@ -330,9 +330,7 @@ _io__Buffered_simple_flush(buffered *self, PyObject
*Py_UNUSED(ignored))
return return_value;
}
-#if defined(_io__Buffered_closed_HAS_DOCSTR)
-# define _io__Buffered_closed_DOCSTR _io__Buffered_closed__doc__
-#else
+#if !defined(_io__Buffered_closed_DOCSTR)
# define _io__Buffered_closed_DOCSTR NULL
#endif
#if defined(_IO__BUFFERED_CLOSED_GETSETDEF)
@@ -472,9 +470,7 @@ _io__Buffered_writable(buffered *self, PyObject
*Py_UNUSED(ignored))
return return_value;
}
-#if defined(_io__Buffered_name_HAS_DOCSTR)
-# define _io__Buffered_name_DOCSTR _io__Buffered_name__doc__
-#else
+#if !defined(_io__Buffered_name_DOCSTR)
# define _io__Buffered_name_DOCSTR NULL
#endif
#if defined(_IO__BUFFERED_NAME_GETSETDEF)
@@ -499,9 +495,7 @@ _io__Buffered_name_get(buffered *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_io__Buffered_mode_HAS_DOCSTR)
-# define _io__Buffered_mode_DOCSTR _io__Buffered_mode__doc__
-#else
+#if !defined(_io__Buffered_mode_DOCSTR)
# define _io__Buffered_mode_DOCSTR NULL
#endif
#if defined(_IO__BUFFERED_MODE_GETSETDEF)
@@ -1252,4 +1246,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject
*args, PyObject *kwargs)
exit:
return return_value;
}
-/*[clinic end generated code: output=36abca5bd2f63ea1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=8f28a97987a9fbe1 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/stringio.c.h b/Modules/_io/clinic/stringio.c.h
index ac8b4b7b85b76d..6f9205af32f010 100644
--- a/Modules/_io/clinic/stringio.c.h
+++ b/Modules/_io/clinic/stringio.c.h
@@ -476,9 +476,7 @@ _io_StringIO___setstate__(stringio *self, PyObject *state)
return return_value;
}
-#if defined(_io_StringIO_closed_HAS_DOCSTR)
-# define _io_StringIO_closed_DOCSTR _io_StringIO_closed__doc__
-#else
+#if !defined(_io_StringIO_closed_DOCSTR)
# define _io_StringIO_closed_DOCSTR NULL
#endif
#if defined(_IO_STRINGIO_CLOSED_GETSETDEF)
@@ -503,9 +501,7 @@ _io_StringIO_closed_get(stringio *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_io_StringIO_line_buffering_HAS_DOCSTR)
-# define _io_StringIO_line_buffering_DOCSTR _io_StringIO_line_buffering__doc__
-#else
+#if !defined(_io_StringIO_line_buffering_DOCSTR)
# define _io_StringIO_line_buffering_DOCSTR NULL
#endif
#if defined(_IO_STRINGIO_LINE_BUFFERING_GETSETDEF)
@@ -530,9 +526,7 @@ _io_StringIO_line_buffering_get(stringio *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_io_StringIO_newlines_HAS_DOCSTR)
-# define _io_StringIO_newlines_DOCSTR _io_StringIO_newlines__doc__
-#else
+#if !defined(_io_StringIO_newlines_DOCSTR)
# define _io_StringIO_newlines_DOCSTR NULL
#endif
#if defined(_IO_STRINGIO_NEWLINES_GETSETDEF)
@@ -556,4 +550,4 @@ _io_StringIO_newlines_get(stringio *self, void
*Py_UNUSED(context))
return return_value;
}
-/*[clinic end generated code: output=8c8d4f8fa32986bb input=a9049054013a1b77]*/
+/*[clinic end generated code: output=9d2b092274469d42 input=a9049054013a1b77]*/
diff --git a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h
index c9301c5a23fa86..160f80ada43660 100644
--- a/Modules/_io/clinic/textio.c.h
+++ b/Modules/_io/clinic/textio.c.h
@@ -208,11 +208,9 @@ PyDoc_STRVAR(_io__TextIOBase_encoding__doc__,
"Encoding of the text stream.\n"
"\n"
"Subclasses should override.");
-#define _io__TextIOBase_encoding_HAS_DOCSTR
+#define _io__TextIOBase_encoding_DOCSTR _io__TextIOBase_encoding__doc__
-#if defined(_io__TextIOBase_encoding_HAS_DOCSTR)
-# define _io__TextIOBase_encoding_DOCSTR _io__TextIOBase_encoding__doc__
-#else
+#if !defined(_io__TextIOBase_encoding_DOCSTR)
# define _io__TextIOBase_encoding_DOCSTR NULL
#endif
#if defined(_IO__TEXTIOBASE_ENCODING_GETSETDEF)
@@ -237,11 +235,9 @@ PyDoc_STRVAR(_io__TextIOBase_newlines__doc__,
"Only line endings translated during reading are considered.\n"
"\n"
"Subclasses should override.");
-#define _io__TextIOBase_newlines_HAS_DOCSTR
+#define _io__TextIOBase_newlines_DOCSTR _io__TextIOBase_newlines__doc__
-#if defined(_io__TextIOBase_newlines_HAS_DOCSTR)
-# define _io__TextIOBase_newlines_DOCSTR _io__TextIOBase_newlines__doc__
-#else
+#if !defined(_io__TextIOBase_newlines_DOCSTR)
# define _io__TextIOBase_newlines_DOCSTR NULL
#endif
#if defined(_IO__TEXTIOBASE_NEWLINES_GETSETDEF)
@@ -264,11 +260,9 @@ PyDoc_STRVAR(_io__TextIOBase_errors__doc__,
"The error setting of the decoder or encoder.\n"
"\n"
"Subclasses should override.");
-#define _io__TextIOBase_errors_HAS_DOCSTR
+#define _io__TextIOBase_errors_DOCSTR _io__TextIOBase_errors__doc__
-#if defined(_io__TextIOBase_errors_HAS_DOCSTR)
-# define _io__TextIOBase_errors_DOCSTR _io__TextIOBase_errors__doc__
-#else
+#if !defined(_io__TextIOBase_errors_DOCSTR)
# define _io__TextIOBase_errors_DOCSTR NULL
#endif
#if defined(_IO__TEXTIOBASE_ERRORS_GETSETDEF)
@@ -1138,9 +1132,7 @@ _io_TextIOWrapper_close(textio *self, PyObject
*Py_UNUSED(ignored))
return return_value;
}
-#if defined(_io_TextIOWrapper_name_HAS_DOCSTR)
-# define _io_TextIOWrapper_name_DOCSTR _io_TextIOWrapper_name__doc__
-#else
+#if !defined(_io_TextIOWrapper_name_DOCSTR)
# define _io_TextIOWrapper_name_DOCSTR NULL
#endif
#if defined(_IO_TEXTIOWRAPPER_NAME_GETSETDEF)
@@ -1165,9 +1157,7 @@ _io_TextIOWrapper_name_get(textio *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_io_TextIOWrapper_closed_HAS_DOCSTR)
-# define _io_TextIOWrapper_closed_DOCSTR _io_TextIOWrapper_closed__doc__
-#else
+#if !defined(_io_TextIOWrapper_closed_DOCSTR)
# define _io_TextIOWrapper_closed_DOCSTR NULL
#endif
#if defined(_IO_TEXTIOWRAPPER_CLOSED_GETSETDEF)
@@ -1192,9 +1182,7 @@ _io_TextIOWrapper_closed_get(textio *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_io_TextIOWrapper_newlines_HAS_DOCSTR)
-# define _io_TextIOWrapper_newlines_DOCSTR _io_TextIOWrapper_newlines__doc__
-#else
+#if !defined(_io_TextIOWrapper_newlines_DOCSTR)
# define _io_TextIOWrapper_newlines_DOCSTR NULL
#endif
#if defined(_IO_TEXTIOWRAPPER_NEWLINES_GETSETDEF)
@@ -1219,9 +1207,7 @@ _io_TextIOWrapper_newlines_get(textio *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_io_TextIOWrapper_errors_HAS_DOCSTR)
-# define _io_TextIOWrapper_errors_DOCSTR _io_TextIOWrapper_errors__doc__
-#else
+#if !defined(_io_TextIOWrapper_errors_DOCSTR)
# define _io_TextIOWrapper_errors_DOCSTR NULL
#endif
#if defined(_IO_TEXTIOWRAPPER_ERRORS_GETSETDEF)
@@ -1246,9 +1232,7 @@ _io_TextIOWrapper_errors_get(textio *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_io_TextIOWrapper__CHUNK_SIZE_HAS_DOCSTR)
-# define _io_TextIOWrapper__CHUNK_SIZE_DOCSTR
_io_TextIOWrapper__CHUNK_SIZE__doc__
-#else
+#if !defined(_io_TextIOWrapper__CHUNK_SIZE_DOCSTR)
# define _io_TextIOWrapper__CHUNK_SIZE_DOCSTR NULL
#endif
#if defined(_IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF)
@@ -1273,9 +1257,7 @@ _io_TextIOWrapper__CHUNK_SIZE_get(textio *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_IO_TEXTIOWRAPPER__CHUNK_SIZE_HAS_DOCSTR)
-# define _io_TextIOWrapper__CHUNK_SIZE_DOCSTR
_io_TextIOWrapper__CHUNK_SIZE__doc__
-#else
+#if !defined(_io_TextIOWrapper__CHUNK_SIZE_DOCSTR)
# define _io_TextIOWrapper__CHUNK_SIZE_DOCSTR NULL
#endif
#if defined(_IO_TEXTIOWRAPPER__CHUNK_SIZE_GETSETDEF)
@@ -1299,4 +1281,4 @@ _io_TextIOWrapper__CHUNK_SIZE_set(textio *self, PyObject
*value, void *Py_UNUSED
return return_value;
}
-/*[clinic end generated code: output=459c0e50acd772b1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1172c500a022c65d input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h
index 582eef16c13244..957f5ced3a2cee 100644
--- a/Modules/clinic/_ssl.c.h
+++ b/Modules/clinic/_ssl.c.h
@@ -258,9 +258,7 @@ _ssl__SSLSocket_compression(PySSLSocket *self, PyObject
*Py_UNUSED(ignored))
return _ssl__SSLSocket_compression_impl(self);
}
-#if defined(_ssl__SSLSocket_context_HAS_DOCSTR)
-# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__
-#else
+#if !defined(_ssl__SSLSocket_context_DOCSTR)
# define _ssl__SSLSocket_context_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF)
@@ -285,9 +283,7 @@ _ssl__SSLSocket_context_get(PySSLSocket *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLSOCKET_CONTEXT_HAS_DOCSTR)
-# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__
-#else
+#if !defined(_ssl__SSLSocket_context_DOCSTR)
# define _ssl__SSLSocket_context_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF)
@@ -314,11 +310,9 @@ _ssl__SSLSocket_context_set(PySSLSocket *self, PyObject
*value, void *Py_UNUSED(
PyDoc_STRVAR(_ssl__SSLSocket_server_side__doc__,
"Whether this is a server-side socket.");
-#define _ssl__SSLSocket_server_side_HAS_DOCSTR
+#define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__
-#if defined(_ssl__SSLSocket_server_side_HAS_DOCSTR)
-# define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__
-#else
+#if !defined(_ssl__SSLSocket_server_side_DOCSTR)
# define _ssl__SSLSocket_server_side_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF)
@@ -345,11 +339,9 @@ _ssl__SSLSocket_server_side_get(PySSLSocket *self, void
*Py_UNUSED(context))
PyDoc_STRVAR(_ssl__SSLSocket_server_hostname__doc__,
"The currently set server hostname (for SNI).");
-#define _ssl__SSLSocket_server_hostname_HAS_DOCSTR
+#define _ssl__SSLSocket_server_hostname_DOCSTR
_ssl__SSLSocket_server_hostname__doc__
-#if defined(_ssl__SSLSocket_server_hostname_HAS_DOCSTR)
-# define _ssl__SSLSocket_server_hostname_DOCSTR
_ssl__SSLSocket_server_hostname__doc__
-#else
+#if !defined(_ssl__SSLSocket_server_hostname_DOCSTR)
# define _ssl__SSLSocket_server_hostname_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF)
@@ -374,9 +366,7 @@ _ssl__SSLSocket_server_hostname_get(PySSLSocket *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR)
-# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__
-#else
+#if !defined(_ssl__SSLSocket_owner_DOCSTR)
# define _ssl__SSLSocket_owner_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF)
@@ -401,9 +391,7 @@ _ssl__SSLSocket_owner_get(PySSLSocket *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLSOCKET_OWNER_HAS_DOCSTR)
-# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__
-#else
+#if !defined(_ssl__SSLSocket_owner_DOCSTR)
# define _ssl__SSLSocket_owner_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF)
@@ -664,9 +652,7 @@ _ssl__SSLSocket_verify_client_post_handshake(PySSLSocket
*self, PyObject *Py_UNU
return return_value;
}
-#if defined(_ssl__SSLSocket_session_HAS_DOCSTR)
-# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__
-#else
+#if !defined(_ssl__SSLSocket_session_DOCSTR)
# define _ssl__SSLSocket_session_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF)
@@ -691,9 +677,7 @@ _ssl__SSLSocket_session_get(PySSLSocket *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLSOCKET_SESSION_HAS_DOCSTR)
-# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__
-#else
+#if !defined(_ssl__SSLSocket_session_DOCSTR)
# define _ssl__SSLSocket_session_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF)
@@ -720,11 +704,9 @@ _ssl__SSLSocket_session_set(PySSLSocket *self, PyObject
*value, void *Py_UNUSED(
PyDoc_STRVAR(_ssl__SSLSocket_session_reused__doc__,
"Was the client session reused during handshake?");
-#define _ssl__SSLSocket_session_reused_HAS_DOCSTR
+#define _ssl__SSLSocket_session_reused_DOCSTR
_ssl__SSLSocket_session_reused__doc__
-#if defined(_ssl__SSLSocket_session_reused_HAS_DOCSTR)
-# define _ssl__SSLSocket_session_reused_DOCSTR
_ssl__SSLSocket_session_reused__doc__
-#else
+#if !defined(_ssl__SSLSocket_session_reused_DOCSTR)
# define _ssl__SSLSocket_session_reused_DOCSTR NULL
#endif
#if defined(_SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF)
@@ -873,9 +855,7 @@ _ssl__SSLContext__set_alpn_protocols(PySSLContext *self,
PyObject *arg)
return return_value;
}
-#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR)
-# define _ssl__SSLContext_verify_mode_DOCSTR
_ssl__SSLContext_verify_mode__doc__
-#else
+#if !defined(_ssl__SSLContext_verify_mode_DOCSTR)
# define _ssl__SSLContext_verify_mode_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF)
@@ -900,9 +880,7 @@ _ssl__SSLContext_verify_mode_get(PySSLContext *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLCONTEXT_VERIFY_MODE_HAS_DOCSTR)
-# define _ssl__SSLContext_verify_mode_DOCSTR
_ssl__SSLContext_verify_mode__doc__
-#else
+#if !defined(_ssl__SSLContext_verify_mode_DOCSTR)
# define _ssl__SSLContext_verify_mode_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF)
@@ -927,9 +905,7 @@ _ssl__SSLContext_verify_mode_set(PySSLContext *self,
PyObject *value, void *Py_U
return return_value;
}
-#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR)
-# define _ssl__SSLContext_verify_flags_DOCSTR
_ssl__SSLContext_verify_flags__doc__
-#else
+#if !defined(_ssl__SSLContext_verify_flags_DOCSTR)
# define _ssl__SSLContext_verify_flags_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF)
@@ -954,9 +930,7 @@ _ssl__SSLContext_verify_flags_get(PySSLContext *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_HAS_DOCSTR)
-# define _ssl__SSLContext_verify_flags_DOCSTR
_ssl__SSLContext_verify_flags__doc__
-#else
+#if !defined(_ssl__SSLContext_verify_flags_DOCSTR)
# define _ssl__SSLContext_verify_flags_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF)
@@ -981,9 +955,7 @@ _ssl__SSLContext_verify_flags_set(PySSLContext *self,
PyObject *value, void *Py_
return return_value;
}
-#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR)
-# define _ssl__SSLContext_minimum_version_DOCSTR
_ssl__SSLContext_minimum_version__doc__
-#else
+#if !defined(_ssl__SSLContext_minimum_version_DOCSTR)
# define _ssl__SSLContext_minimum_version_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF)
@@ -1008,9 +980,7 @@ _ssl__SSLContext_minimum_version_get(PySSLContext *self,
void *Py_UNUSED(context
return return_value;
}
-#if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_HAS_DOCSTR)
-# define _ssl__SSLContext_minimum_version_DOCSTR
_ssl__SSLContext_minimum_version__doc__
-#else
+#if !defined(_ssl__SSLContext_minimum_version_DOCSTR)
# define _ssl__SSLContext_minimum_version_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF)
@@ -1036,9 +1006,7 @@ _ssl__SSLContext_minimum_version_set(PySSLContext *self,
PyObject *value, void *
return return_value;
}
-#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR)
-# define _ssl__SSLContext_maximum_version_DOCSTR
_ssl__SSLContext_maximum_version__doc__
-#else
+#if !defined(_ssl__SSLContext_maximum_version_DOCSTR)
# define _ssl__SSLContext_maximum_version_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF)
@@ -1063,9 +1031,7 @@ _ssl__SSLContext_maximum_version_get(PySSLContext *self,
void *Py_UNUSED(context
return return_value;
}
-#if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_HAS_DOCSTR)
-# define _ssl__SSLContext_maximum_version_DOCSTR
_ssl__SSLContext_maximum_version__doc__
-#else
+#if !defined(_ssl__SSLContext_maximum_version_DOCSTR)
# define _ssl__SSLContext_maximum_version_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF)
@@ -1091,9 +1057,7 @@ _ssl__SSLContext_maximum_version_set(PySSLContext *self,
PyObject *value, void *
return return_value;
}
-#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR)
-# define _ssl__SSLContext_num_tickets_DOCSTR
_ssl__SSLContext_num_tickets__doc__
-#else
+#if !defined(_ssl__SSLContext_num_tickets_DOCSTR)
# define _ssl__SSLContext_num_tickets_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF)
@@ -1118,9 +1082,7 @@ _ssl__SSLContext_num_tickets_get(PySSLContext *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLCONTEXT_NUM_TICKETS_HAS_DOCSTR)
-# define _ssl__SSLContext_num_tickets_DOCSTR
_ssl__SSLContext_num_tickets__doc__
-#else
+#if !defined(_ssl__SSLContext_num_tickets_DOCSTR)
# define _ssl__SSLContext_num_tickets_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF)
@@ -1145,9 +1107,7 @@ _ssl__SSLContext_num_tickets_set(PySSLContext *self,
PyObject *value, void *Py_U
return return_value;
}
-#if defined(_ssl__SSLContext_security_level_HAS_DOCSTR)
-# define _ssl__SSLContext_security_level_DOCSTR
_ssl__SSLContext_security_level__doc__
-#else
+#if !defined(_ssl__SSLContext_security_level_DOCSTR)
# define _ssl__SSLContext_security_level_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF)
@@ -1172,9 +1132,7 @@ _ssl__SSLContext_security_level_get(PySSLContext *self,
void *Py_UNUSED(context)
return return_value;
}
-#if defined(_ssl__SSLContext_options_HAS_DOCSTR)
-# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__
-#else
+#if !defined(_ssl__SSLContext_options_DOCSTR)
# define _ssl__SSLContext_options_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF)
@@ -1199,9 +1157,7 @@ _ssl__SSLContext_options_get(PySSLContext *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLCONTEXT_OPTIONS_HAS_DOCSTR)
-# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__
-#else
+#if !defined(_ssl__SSLContext_options_DOCSTR)
# define _ssl__SSLContext_options_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF)
@@ -1226,9 +1182,7 @@ _ssl__SSLContext_options_set(PySSLContext *self, PyObject
*value, void *Py_UNUSE
return return_value;
}
-#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR)
-# define _ssl__SSLContext__host_flags_DOCSTR
_ssl__SSLContext__host_flags__doc__
-#else
+#if !defined(_ssl__SSLContext__host_flags_DOCSTR)
# define _ssl__SSLContext__host_flags_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF)
@@ -1253,9 +1207,7 @@ _ssl__SSLContext__host_flags_get(PySSLContext *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLCONTEXT__HOST_FLAGS_HAS_DOCSTR)
-# define _ssl__SSLContext__host_flags_DOCSTR
_ssl__SSLContext__host_flags__doc__
-#else
+#if !defined(_ssl__SSLContext__host_flags_DOCSTR)
# define _ssl__SSLContext__host_flags_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF)
@@ -1280,9 +1232,7 @@ _ssl__SSLContext__host_flags_set(PySSLContext *self,
PyObject *value, void *Py_U
return return_value;
}
-#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR)
-# define _ssl__SSLContext_check_hostname_DOCSTR
_ssl__SSLContext_check_hostname__doc__
-#else
+#if !defined(_ssl__SSLContext_check_hostname_DOCSTR)
# define _ssl__SSLContext_check_hostname_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF)
@@ -1307,9 +1257,7 @@ _ssl__SSLContext_check_hostname_get(PySSLContext *self,
void *Py_UNUSED(context)
return return_value;
}
-#if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_HAS_DOCSTR)
-# define _ssl__SSLContext_check_hostname_DOCSTR
_ssl__SSLContext_check_hostname__doc__
-#else
+#if !defined(_ssl__SSLContext_check_hostname_DOCSTR)
# define _ssl__SSLContext_check_hostname_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF)
@@ -1334,9 +1282,7 @@ _ssl__SSLContext_check_hostname_set(PySSLContext *self,
PyObject *value, void *P
return return_value;
}
-#if defined(_ssl__SSLContext_protocol_HAS_DOCSTR)
-# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__
-#else
+#if !defined(_ssl__SSLContext_protocol_DOCSTR)
# define _ssl__SSLContext_protocol_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_PROTOCOL_GETSETDEF)
@@ -1799,9 +1745,7 @@ _ssl__SSLContext_set_ecdh_curve(PySSLContext *self,
PyObject *name)
return return_value;
}
-#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR)
-# define _ssl__SSLContext_sni_callback_DOCSTR
_ssl__SSLContext_sni_callback__doc__
-#else
+#if !defined(_ssl__SSLContext_sni_callback_DOCSTR)
# define _ssl__SSLContext_sni_callback_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF)
@@ -1826,9 +1770,7 @@ _ssl__SSLContext_sni_callback_get(PySSLContext *self,
void *Py_UNUSED(context))
return return_value;
}
-#if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_HAS_DOCSTR)
-# define _ssl__SSLContext_sni_callback_DOCSTR
_ssl__SSLContext_sni_callback__doc__
-#else
+#if !defined(_ssl__SSLContext_sni_callback_DOCSTR)
# define _ssl__SSLContext_sni_callback_DOCSTR NULL
#endif
#if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF)
@@ -2121,9 +2063,7 @@ _ssl_MemoryBIO(PyTypeObject *type, PyObject *args,
PyObject *kwargs)
return return_value;
}
-#if defined(_ssl_MemoryBIO_pending_HAS_DOCSTR)
-# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__
-#else
+#if !defined(_ssl_MemoryBIO_pending_DOCSTR)
# define _ssl_MemoryBIO_pending_DOCSTR NULL
#endif
#if defined(_SSL_MEMORYBIO_PENDING_GETSETDEF)
@@ -2148,9 +2088,7 @@ _ssl_MemoryBIO_pending_get(PySSLMemoryBIO *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_ssl_MemoryBIO_eof_HAS_DOCSTR)
-# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__
-#else
+#if !defined(_ssl_MemoryBIO_eof_DOCSTR)
# define _ssl_MemoryBIO_eof_DOCSTR NULL
#endif
#if defined(_SSL_MEMORYBIO_EOF_GETSETDEF)
@@ -2279,9 +2217,7 @@ _ssl_MemoryBIO_write_eof(PySSLMemoryBIO *self, PyObject
*Py_UNUSED(ignored))
return return_value;
}
-#if defined(_ssl_SSLSession_time_HAS_DOCSTR)
-# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__
-#else
+#if !defined(_ssl_SSLSession_time_DOCSTR)
# define _ssl_SSLSession_time_DOCSTR NULL
#endif
#if defined(_SSL_SSLSESSION_TIME_GETSETDEF)
@@ -2306,9 +2242,7 @@ _ssl_SSLSession_time_get(PySSLSession *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_ssl_SSLSession_timeout_HAS_DOCSTR)
-# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__
-#else
+#if !defined(_ssl_SSLSession_timeout_DOCSTR)
# define _ssl_SSLSession_timeout_DOCSTR NULL
#endif
#if defined(_SSL_SSLSESSION_TIMEOUT_GETSETDEF)
@@ -2333,9 +2267,7 @@ _ssl_SSLSession_timeout_get(PySSLSession *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR)
-# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR
_ssl_SSLSession_ticket_lifetime_hint__doc__
-#else
+#if !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR)
# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR NULL
#endif
#if defined(_SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF)
@@ -2360,9 +2292,7 @@ _ssl_SSLSession_ticket_lifetime_hint_get(PySSLSession
*self, void *Py_UNUSED(con
return return_value;
}
-#if defined(_ssl_SSLSession_id_HAS_DOCSTR)
-# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__
-#else
+#if !defined(_ssl_SSLSession_id_DOCSTR)
# define _ssl_SSLSession_id_DOCSTR NULL
#endif
#if defined(_SSL_SSLSESSION_ID_GETSETDEF)
@@ -2387,9 +2317,7 @@ _ssl_SSLSession_id_get(PySSLSession *self, void
*Py_UNUSED(context))
return return_value;
}
-#if defined(_ssl_SSLSession_has_ticket_HAS_DOCSTR)
-# define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__
-#else
+#if !defined(_ssl_SSLSession_has_ticket_DOCSTR)
# define _ssl_SSLSession_has_ticket_DOCSTR NULL
#endif
#if defined(_SSL_SSLSESSION_HAS_TICKET_GETSETDEF)
@@ -2839,4 +2767,4 @@ _ssl_enum_crls(PyObject *module, PyObject *const *args,
Py_ssize_t nargs, PyObje
#ifndef _SSL_ENUM_CRLS_METHODDEF
#define _SSL_ENUM_CRLS_METHODDEF
#endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
-/*[clinic end generated code: output=4c2af0c8fab7ec4e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=44ab066d21277ee5 input=a9049054013a1b77]*/
diff --git a/Tools/clinic/libclinic/parse_args.py
b/Tools/clinic/libclinic/parse_args.py
index fc2d9fe987096d..a57d729bec5733 100644
--- a/Tools/clinic/libclinic/parse_args.py
+++ b/Tools/clinic/libclinic/parse_args.py
@@ -146,7 +146,7 @@ def declare_parser(
GETSET_DOCSTRING_PROTOTYPE_STRVAR: Final[str] = libclinic.normalize_snippet("""
PyDoc_STRVAR({getset_basename}__doc__,
{docstring});
- #define {getset_basename}_HAS_DOCSTR
+ #define {getset_basename}_DOCSTR {getset_basename}__doc__
""")
IMPL_DEFINITION_PROTOTYPE: Final[str] = libclinic.normalize_snippet("""
static {impl_return_type}
@@ -157,9 +157,7 @@ def declare_parser(
{{"{name}", {methoddef_cast}{c_basename}{methoddef_cast_end},
{methoddef_flags}, {c_basename}__doc__}},
""")
GETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r"""
- #if defined({getset_basename}_HAS_DOCSTR)
- # define {getset_basename}_DOCSTR {getset_basename}__doc__
- #else
+ #if !defined({getset_basename}_DOCSTR)
# define {getset_basename}_DOCSTR NULL
#endif
#if defined({getset_name}_GETSETDEF)
@@ -170,9 +168,7 @@ def declare_parser(
#endif
""")
SETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r"""
- #if defined({getset_name}_HAS_DOCSTR)
- # define {getset_basename}_DOCSTR {getset_basename}__doc__
- #else
+ #if !defined({getset_basename}_DOCSTR)
# define {getset_basename}_DOCSTR NULL
#endif
#if defined({getset_name}_GETSETDEF)
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
