From 5eee04d44ca8e182c897b6e3f3ef79dc6cbb969d Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:33:40 -0500 Subject: [PATCH 01/19] Restore docstring for context. --- Modules/_ssl.c | 8 +++++++- Modules/clinic/_ssl.c.h | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index b6b5ebf094c938..6661927fc77a3c 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2161,11 +2161,17 @@ _ssl__SSLSocket_compression_impl(PySSLSocket *self) @critical_section @getter _ssl._SSLSocket.context + +This changes the context associated with the SSLSocket. + +This is typically used from within a callback function set by the sni_callback +on the SSLContext to change the certificate information associated with the +SSLSocket before the cryptographic exchange handshake messages. [clinic start generated code]*/ static PyObject * _ssl__SSLSocket_context_get_impl(PySSLSocket *self) -/*[clinic end generated code: output=d23e82f72f32e3d7 input=25aa82e4d9fa344a]*/ +/*[clinic end generated code: output=d23e82f72f32e3d7 input=7cbb97407c2ace30]*/ { return Py_NewRef(self->ctx); } diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 582eef16c13244..fa189f6e738bc8 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -258,6 +258,14 @@ _ssl__SSLSocket_compression(PySSLSocket *self, PyObject *Py_UNUSED(ignored)) return _ssl__SSLSocket_compression_impl(self); } +PyDoc_STRVAR(_ssl__SSLSocket_context__doc__, +"This changes the context associated with the SSLSocket.\n" +"\n" +"This is typically used from within a callback function set by the sni_callback\n" +"on the SSLContext to change the certificate information associated with the\n" +"SSLSocket before the cryptographic exchange handshake messages."); +#define _ssl__SSLSocket_context_HAS_DOCSTR + #if defined(_ssl__SSLSocket_context_HAS_DOCSTR) # define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ #else @@ -2839,4 +2847,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=2a4d3d6cb794677b input=a9049054013a1b77]*/ From f11f7ed87bbce71db4b2dc5518f9733dc9986c5d Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:37:05 -0500 Subject: [PATCH 02/19] Restore docstring for owner and session. --- Modules/_ssl.c | 10 ++++++++-- Modules/clinic/_ssl.c.h | 12 +++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 6661927fc77a3c..c64cea23ca3224 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2238,11 +2238,15 @@ _ssl__SSLSocket_server_hostname_get_impl(PySSLSocket *self) @critical_section @getter _ssl._SSLSocket.owner + +The Python-level owner of this object. + +Passed as "self" in servername callback. [clinic start generated code]*/ static PyObject * _ssl__SSLSocket_owner_get_impl(PySSLSocket *self) -/*[clinic end generated code: output=1f278cb930382927 input=bc2861ff3cf1402e]*/ +/*[clinic end generated code: output=1f278cb930382927 input=978a8382d9c25c92]*/ { if (self->owner == NULL) { Py_RETURN_NONE; @@ -2856,11 +2860,13 @@ _ssl__SSLSocket_verify_client_post_handshake_impl(PySSLSocket *self) @critical_section @getter _ssl._SSLSocket.session + +The underlying SSLSession object. [clinic start generated code]*/ static PyObject * _ssl__SSLSocket_session_get_impl(PySSLSocket *self) -/*[clinic end generated code: output=a5cd5755b35da670 input=b9792df9255a9f63]*/ +/*[clinic end generated code: output=a5cd5755b35da670 input=d427318604244bf8]*/ { /* get_session can return sessions from a server-side connection, * it does not check for handshake done or client socket. */ diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index fa189f6e738bc8..dabb445cf27efe 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -382,6 +382,12 @@ _ssl__SSLSocket_server_hostname_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } +PyDoc_STRVAR(_ssl__SSLSocket_owner__doc__, +"The Python-level owner of this object.\n" +"\n" +"Passed as \"self\" in servername callback."); +#define _ssl__SSLSocket_owner_HAS_DOCSTR + #if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) # define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ #else @@ -672,6 +678,10 @@ _ssl__SSLSocket_verify_client_post_handshake(PySSLSocket *self, PyObject *Py_UNU return return_value; } +PyDoc_STRVAR(_ssl__SSLSocket_session__doc__, +"The underlying SSLSession object."); +#define _ssl__SSLSocket_session_HAS_DOCSTR + #if defined(_ssl__SSLSocket_session_HAS_DOCSTR) # define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ #else @@ -2847,4 +2857,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=2a4d3d6cb794677b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=dfcc8d2071861baf input=a9049054013a1b77]*/ From 78129350b57cd2dfc1730aa49d02a7b866b43eff Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:39:09 -0500 Subject: [PATCH 03/19] Restore docstring for num_tickets. --- Modules/_ssl.c | 4 +++- Modules/clinic/_ssl.c.h | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index c64cea23ca3224..0989619d50aff6 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -3668,11 +3668,13 @@ _ssl__SSLContext_maximum_version_set_impl(PySSLContext *self, @critical_section @getter _ssl._SSLContext.num_tickets + +Control the number of TLSv1.3 session tickets. [clinic start generated code]*/ static PyObject * _ssl__SSLContext_num_tickets_get_impl(PySSLContext *self) -/*[clinic end generated code: output=3d06d016318846c9 input=1dee26d75163c073]*/ +/*[clinic end generated code: output=3d06d016318846c9 input=1e2599a2e22564ff]*/ { // Clinic seems to be misbehaving when the comment is wrapped with in directive #if defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3) diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index dabb445cf27efe..1fe59c8252dffa 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -1109,6 +1109,10 @@ _ssl__SSLContext_maximum_version_set(PySSLContext *self, PyObject *value, void * return return_value; } +PyDoc_STRVAR(_ssl__SSLContext_num_tickets__doc__, +"Control the number of TLSv1.3 session tickets."); +#define _ssl__SSLContext_num_tickets_HAS_DOCSTR + #if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) # define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ #else @@ -2857,4 +2861,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=dfcc8d2071861baf input=a9049054013a1b77]*/ +/*[clinic end generated code: output=19f8bdb59b6f0f7d input=a9049054013a1b77]*/ From a405d15905cfcc8d0a21171449a14fb47ce5723a Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:39:47 -0500 Subject: [PATCH 04/19] Restore docstring for security_level. --- Modules/_ssl.c | 4 +++- Modules/clinic/_ssl.c.h | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 0989619d50aff6..8b2eb7b6c197f2 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -3718,11 +3718,13 @@ _ssl__SSLContext_num_tickets_set_impl(PySSLContext *self, PyObject *value) @critical_section @getter _ssl._SSLContext.security_level + +The current security level. [clinic start generated code]*/ static PyObject * _ssl__SSLContext_security_level_get_impl(PySSLContext *self) -/*[clinic end generated code: output=56ece09e6a9572d0 input=a0416598e07c3183]*/ +/*[clinic end generated code: output=56ece09e6a9572d0 input=2bdeecb57bb86e3f]*/ { PyObject *res = PyLong_FromLong(SSL_CTX_get_security_level(self->ctx)); return res; diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 1fe59c8252dffa..f8539cf087fa61 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -1167,6 +1167,10 @@ _ssl__SSLContext_num_tickets_set(PySSLContext *self, PyObject *value, void *Py_U return return_value; } +PyDoc_STRVAR(_ssl__SSLContext_security_level__doc__, +"The current security level."); +#define _ssl__SSLContext_security_level_HAS_DOCSTR + #if defined(_ssl__SSLContext_security_level_HAS_DOCSTR) # define _ssl__SSLContext_security_level_DOCSTR _ssl__SSLContext_security_level__doc__ #else @@ -2861,4 +2865,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=19f8bdb59b6f0f7d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=b04893e573373045 input=a9049054013a1b77]*/ From a309206229e01f30652b6b8c59c3041f44be5df1 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:41:08 -0500 Subject: [PATCH 05/19] Restore docstring for sni_callback. --- Modules/_ssl.c | 9 ++++++++- Modules/clinic/_ssl.c.h | 11 ++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 8b2eb7b6c197f2..34e066b672071e 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -4681,11 +4681,18 @@ _servername_callback(SSL *s, int *al, void *args) @critical_section @getter _ssl._SSLContext.sni_callback + +Set a callback that will be called when a server name is provided by the SSL/TLS client in the SNI extension. + +If the argument is None then the callback is disabled. The method is called +with the SSLSocket, the server name as a string, and the SSLContext object. + +See RFC 6066 for details of the SNI extension. [clinic start generated code]*/ static PyObject * _ssl__SSLContext_sni_callback_get_impl(PySSLContext *self) -/*[clinic end generated code: output=961e6575cdfaf036 input=22dd28c31fdc4318]*/ +/*[clinic end generated code: output=961e6575cdfaf036 input=9b2473c5e984cfe6]*/ { PyObject *cb = self->set_sni_cb; if (cb == NULL) { diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index f8539cf087fa61..b293237afe8c51 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -1825,6 +1825,15 @@ _ssl__SSLContext_set_ecdh_curve(PySSLContext *self, PyObject *name) return return_value; } +PyDoc_STRVAR(_ssl__SSLContext_sni_callback__doc__, +"Set a callback that will be called when a server name is provided by the SSL/TLS client in the SNI extension.\n" +"\n" +"If the argument is None then the callback is disabled. The method is called\n" +"with the SSLSocket, the server name as a string, and the SSLContext object.\n" +"\n" +"See RFC 6066 for details of the SNI extension."); +#define _ssl__SSLContext_sni_callback_HAS_DOCSTR + #if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) # define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ #else @@ -2865,4 +2874,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=b04893e573373045 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e4b763ac8f5ac41a input=a9049054013a1b77]*/ From 84dc0ab740da4fd721161e1ad347685384b24346 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:42:39 -0500 Subject: [PATCH 06/19] Restore docstring for time. --- Modules/_ssl.c | 8 ++++++-- Modules/clinic/_ssl.c.h | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 34e066b672071e..5f1e53529df8d6 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5279,11 +5279,13 @@ _ssl_MemoryBIO_pending_get_impl(PySSLMemoryBIO *self) @critical_section @getter _ssl.MemoryBIO.eof + +Whether the memory BIO is at EOF. [clinic start generated code]*/ static PyObject * _ssl_MemoryBIO_eof_get_impl(PySSLMemoryBIO *self) -/*[clinic end generated code: output=c255a9ea16e31b92 input=0f5c6be69752e04c]*/ +/*[clinic end generated code: output=c255a9ea16e31b92 input=c6ecc12c4509de1f]*/ { size_t pending = BIO_ctrl_pending(self->bio); return PyBool_FromLong((pending == 0) && self->eof_written); @@ -5524,11 +5526,13 @@ PySSLSession_clear(PySSLSession *self) @critical_section @getter _ssl.SSLSession.time + +Session creation time (seconds since epoch). [clinic start generated code]*/ static PyObject * _ssl_SSLSession_time_get_impl(PySSLSession *self) -/*[clinic end generated code: output=4b887b9299de9be4 input=8d1e4afd09103279]*/ +/*[clinic end generated code: output=4b887b9299de9be4 input=67f2325284450ae2]*/ { #if OPENSSL_VERSION_NUMBER >= 0x30300000L return _PyLong_FromTime_t(SSL_SESSION_get_time_ex(self->session)); diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index b293237afe8c51..c39b1f8d637acd 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -2183,6 +2183,10 @@ _ssl_MemoryBIO_pending_get(PySSLMemoryBIO *self, void *Py_UNUSED(context)) return return_value; } +PyDoc_STRVAR(_ssl_MemoryBIO_eof__doc__, +"Whether the memory BIO is at EOF."); +#define _ssl_MemoryBIO_eof_HAS_DOCSTR + #if defined(_ssl_MemoryBIO_eof_HAS_DOCSTR) # define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ #else @@ -2314,6 +2318,10 @@ _ssl_MemoryBIO_write_eof(PySSLMemoryBIO *self, PyObject *Py_UNUSED(ignored)) return return_value; } +PyDoc_STRVAR(_ssl_SSLSession_time__doc__, +"Session creation time (seconds since epoch)."); +#define _ssl_SSLSession_time_HAS_DOCSTR + #if defined(_ssl_SSLSession_time_HAS_DOCSTR) # define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ #else @@ -2874,4 +2882,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=e4b763ac8f5ac41a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=47936f2b645dbd0e input=a9049054013a1b77]*/ From 15342e74f9e6fae23647f23361021148520952ac Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:43:59 -0500 Subject: [PATCH 07/19] Restore docstring for timeout. --- Modules/_ssl.c | 4 +++- Modules/clinic/_ssl.c.h | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 5f1e53529df8d6..40bf9a8b781e13 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5545,11 +5545,13 @@ _ssl_SSLSession_time_get_impl(PySSLSession *self) @critical_section @getter _ssl.SSLSession.timeout + +Session timeout (delta in seconds). [clinic start generated code]*/ static PyObject * _ssl_SSLSession_timeout_get_impl(PySSLSession *self) -/*[clinic end generated code: output=82339c148ab2f7d1 input=ae5e84a9d85df60d]*/ +/*[clinic end generated code: output=82339c148ab2f7d1 input=cd17c2b087c442f2]*/ { long timeout = SSL_SESSION_get_timeout(self->session); PyObject *res = PyLong_FromLong(timeout); diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index c39b1f8d637acd..8a0b2fc9b0afac 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -2349,6 +2349,10 @@ _ssl_SSLSession_time_get(PySSLSession *self, void *Py_UNUSED(context)) return return_value; } +PyDoc_STRVAR(_ssl_SSLSession_timeout__doc__, +"Session timeout (delta in seconds)."); +#define _ssl_SSLSession_timeout_HAS_DOCSTR + #if defined(_ssl_SSLSession_timeout_HAS_DOCSTR) # define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ #else @@ -2882,4 +2886,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=47936f2b645dbd0e input=a9049054013a1b77]*/ +/*[clinic end generated code: output=140bb3df9f225dd7 input=a9049054013a1b77]*/ From 3907c38ed5095d0fe5e692fb1b249c6f321c3d77 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:45:14 -0500 Subject: [PATCH 08/19] Restore docstring for id. --- Modules/_ssl.c | 4 +++- Modules/clinic/_ssl.c.h | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 40bf9a8b781e13..cd115db8ff508a 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5576,11 +5576,13 @@ _ssl_SSLSession_ticket_lifetime_hint_get_impl(PySSLSession *self) @critical_section @getter _ssl.SSLSession.id + +Session ID. [clinic start generated code]*/ static PyObject * _ssl_SSLSession_id_get_impl(PySSLSession *self) -/*[clinic end generated code: output=c532fb96b10c5adf input=e7322372cf6325dd]*/ +/*[clinic end generated code: output=c532fb96b10c5adf input=0a379e64312b776d]*/ { const unsigned char *id; diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 8a0b2fc9b0afac..31ed73845271de 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -2407,6 +2407,10 @@ _ssl_SSLSession_ticket_lifetime_hint_get(PySSLSession *self, void *Py_UNUSED(con return return_value; } +PyDoc_STRVAR(_ssl_SSLSession_id__doc__, +"Session ID."); +#define _ssl_SSLSession_id_HAS_DOCSTR + #if defined(_ssl_SSLSession_id_HAS_DOCSTR) # define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ #else @@ -2886,4 +2890,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=140bb3df9f225dd7 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=efd7420662847bfe input=a9049054013a1b77]*/ From 4fa89c1607205ff210a5af4eb3028615d4bb2731 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:46:09 -0500 Subject: [PATCH 09/19] Restore docstring for ticket_lifetime_hint. --- Modules/_ssl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index cd115db8ff508a..0c7a32b911bd86 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5562,6 +5562,8 @@ _ssl_SSLSession_timeout_get_impl(PySSLSession *self) @critical_section @getter _ssl.SSLSession.ticket_lifetime_hint + +Ticket life time hint. [clinic start generated code]*/ static PyObject * From c80c80d4fe1b6ab5c6393b6febfaff7b7ae7c1d4 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:46:32 -0500 Subject: [PATCH 10/19] Run clinic. --- Modules/_ssl.c | 2 +- Modules/clinic/_ssl.c.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 0c7a32b911bd86..1d40070239c86a 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5568,7 +5568,7 @@ Ticket life time hint. static PyObject * _ssl_SSLSession_ticket_lifetime_hint_get_impl(PySSLSession *self) -/*[clinic end generated code: output=c8b6db498136c275 input=d0e06942ddd8d07f]*/ +/*[clinic end generated code: output=c8b6db498136c275 input=f0e2df50961a7806]*/ { unsigned long hint = SSL_SESSION_get_ticket_lifetime_hint(self->session); return PyLong_FromUnsignedLong(hint); diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 31ed73845271de..e73b6a48361e84 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -2380,6 +2380,10 @@ _ssl_SSLSession_timeout_get(PySSLSession *self, void *Py_UNUSED(context)) return return_value; } +PyDoc_STRVAR(_ssl_SSLSession_ticket_lifetime_hint__doc__, +"Ticket life time hint."); +#define _ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR + #if defined(_ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR) # define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR _ssl_SSLSession_ticket_lifetime_hint__doc__ #else @@ -2890,4 +2894,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=efd7420662847bfe input=a9049054013a1b77]*/ +/*[clinic end generated code: output=47cf654183c8f76a input=a9049054013a1b77]*/ From e6992350548befb6e684946fb91b636a7714e9a5 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:47:09 -0500 Subject: [PATCH 11/19] Restore docstring for has_ticket --- Modules/_ssl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 1d40070239c86a..791d9688bdcafc 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5597,6 +5597,8 @@ _ssl_SSLSession_id_get_impl(PySSLSession *self) @critical_section @getter _ssl.SSLSession.has_ticket + +Does the session contain a ticket? [clinic start generated code]*/ static PyObject * From 06235127305672bfad17edc67f5ba42aec801470 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Mon, 25 Nov 2024 19:47:33 -0500 Subject: [PATCH 12/19] Run clinic. --- Modules/_ssl.c | 2 +- Modules/clinic/_ssl.c.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 791d9688bdcafc..7b43a61b68e3e8 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5603,7 +5603,7 @@ Does the session contain a ticket? static PyObject * _ssl_SSLSession_has_ticket_get_impl(PySSLSession *self) -/*[clinic end generated code: output=aa3ccfc40b10b96d input=1a48ae8955fa9601]*/ +/*[clinic end generated code: output=aa3ccfc40b10b96d input=fa475555f53a5086]*/ { int res = SSL_SESSION_has_ticket(self->session); return res ? Py_True : Py_False; diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index e73b6a48361e84..46716abfa52e7d 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -2442,6 +2442,10 @@ _ssl_SSLSession_id_get(PySSLSession *self, void *Py_UNUSED(context)) return return_value; } +PyDoc_STRVAR(_ssl_SSLSession_has_ticket__doc__, +"Does the session contain a ticket?"); +#define _ssl_SSLSession_has_ticket_HAS_DOCSTR + #if defined(_ssl_SSLSession_has_ticket_HAS_DOCSTR) # define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__ #else @@ -2894,4 +2898,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=47cf654183c8f76a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=4d56efa56bb6a3b4 input=a9049054013a1b77]*/ From f4973d1ef639194720e5905a1dfe0834fcbcb929 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Tue, 26 Nov 2024 16:06:48 -0500 Subject: [PATCH 13/19] Don't redefine docstrings macros in clinic. --- Modules/clinic/_ssl.c.h | 314 +++++++++++++++++++-------- Tools/clinic/libclinic/parse_args.py | 18 +- 2 files changed, 242 insertions(+), 90 deletions(-) diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 46716abfa52e7d..5f7a0180446ff6 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -267,9 +267,13 @@ PyDoc_STRVAR(_ssl__SSLSocket_context__doc__, #define _ssl__SSLSocket_context_HAS_DOCSTR #if defined(_ssl__SSLSocket_context_HAS_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ +# if !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ +# endif #else -# define _ssl__SSLSocket_context_DOCSTR NULL +# if !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF) # undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF @@ -293,10 +297,14 @@ _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__ +#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ +# endif #else -# define _ssl__SSLSocket_context_DOCSTR NULL +# if !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF) # undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF @@ -325,9 +333,13 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_side__doc__, #define _ssl__SSLSocket_server_side_HAS_DOCSTR #if defined(_ssl__SSLSocket_server_side_HAS_DOCSTR) -# define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__ +# if !defined(_ssl__SSLSocket_server_side_DOCSTR) +# define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__ +# endif #else -# define _ssl__SSLSocket_server_side_DOCSTR NULL +# if !defined(_ssl__SSLSocket_server_side_DOCSTR) +# define _ssl__SSLSocket_server_side_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF) # undef _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF @@ -356,9 +368,13 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_hostname__doc__, #define _ssl__SSLSocket_server_hostname_HAS_DOCSTR #if defined(_ssl__SSLSocket_server_hostname_HAS_DOCSTR) -# define _ssl__SSLSocket_server_hostname_DOCSTR _ssl__SSLSocket_server_hostname__doc__ +# if !defined(_ssl__SSLSocket_server_hostname_DOCSTR) +# define _ssl__SSLSocket_server_hostname_DOCSTR _ssl__SSLSocket_server_hostname__doc__ +# endif #else -# define _ssl__SSLSocket_server_hostname_DOCSTR NULL +# if !defined(_ssl__SSLSocket_server_hostname_DOCSTR) +# define _ssl__SSLSocket_server_hostname_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF) # undef _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF @@ -389,9 +405,13 @@ PyDoc_STRVAR(_ssl__SSLSocket_owner__doc__, #define _ssl__SSLSocket_owner_HAS_DOCSTR #if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ +# if !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ +# endif #else -# define _ssl__SSLSocket_owner_DOCSTR NULL +# if !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF) # undef _SSL__SSLSOCKET_OWNER_GETSETDEF @@ -415,10 +435,14 @@ _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__ +#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ +# endif #else -# define _ssl__SSLSocket_owner_DOCSTR NULL +# if !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF) # undef _SSL__SSLSOCKET_OWNER_GETSETDEF @@ -683,9 +707,13 @@ PyDoc_STRVAR(_ssl__SSLSocket_session__doc__, #define _ssl__SSLSocket_session_HAS_DOCSTR #if defined(_ssl__SSLSocket_session_HAS_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ +# if !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ +# endif #else -# define _ssl__SSLSocket_session_DOCSTR NULL +# if !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_GETSETDEF @@ -709,10 +737,14 @@ _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__ +#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ +# endif #else -# define _ssl__SSLSocket_session_DOCSTR NULL +# if !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_GETSETDEF @@ -741,9 +773,13 @@ PyDoc_STRVAR(_ssl__SSLSocket_session_reused__doc__, #define _ssl__SSLSocket_session_reused_HAS_DOCSTR #if defined(_ssl__SSLSocket_session_reused_HAS_DOCSTR) -# define _ssl__SSLSocket_session_reused_DOCSTR _ssl__SSLSocket_session_reused__doc__ +# if !defined(_ssl__SSLSocket_session_reused_DOCSTR) +# define _ssl__SSLSocket_session_reused_DOCSTR _ssl__SSLSocket_session_reused__doc__ +# endif #else -# define _ssl__SSLSocket_session_reused_DOCSTR NULL +# if !defined(_ssl__SSLSocket_session_reused_DOCSTR) +# define _ssl__SSLSocket_session_reused_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF @@ -892,9 +928,13 @@ _ssl__SSLContext__set_alpn_protocols(PySSLContext *self, PyObject *arg) } #if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ +# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ +# endif #else -# define _ssl__SSLContext_verify_mode_DOCSTR NULL +# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF @@ -918,10 +958,14 @@ _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__ +#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ +# endif #else -# define _ssl__SSLContext_verify_mode_DOCSTR NULL +# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF @@ -946,9 +990,13 @@ _ssl__SSLContext_verify_mode_set(PySSLContext *self, PyObject *value, void *Py_U } #if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ +# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ +# endif #else -# define _ssl__SSLContext_verify_flags_DOCSTR NULL +# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF @@ -972,10 +1020,14 @@ _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__ +#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ +# endif #else -# define _ssl__SSLContext_verify_flags_DOCSTR NULL +# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF @@ -1000,9 +1052,13 @@ _ssl__SSLContext_verify_flags_set(PySSLContext *self, PyObject *value, void *Py_ } #if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ +# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ +# endif #else -# define _ssl__SSLContext_minimum_version_DOCSTR NULL +# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF @@ -1026,10 +1082,14 @@ _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__ +#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ +# endif #else -# define _ssl__SSLContext_minimum_version_DOCSTR NULL +# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF @@ -1055,9 +1115,13 @@ _ssl__SSLContext_minimum_version_set(PySSLContext *self, PyObject *value, void * } #if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ +# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ +# endif #else -# define _ssl__SSLContext_maximum_version_DOCSTR NULL +# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF @@ -1081,10 +1145,14 @@ _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__ +#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ +# endif #else -# define _ssl__SSLContext_maximum_version_DOCSTR NULL +# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF @@ -1114,9 +1182,13 @@ PyDoc_STRVAR(_ssl__SSLContext_num_tickets__doc__, #define _ssl__SSLContext_num_tickets_HAS_DOCSTR #if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ +# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ +# endif #else -# define _ssl__SSLContext_num_tickets_DOCSTR NULL +# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF) # undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF @@ -1140,10 +1212,14 @@ _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__ +#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ +# endif #else -# define _ssl__SSLContext_num_tickets_DOCSTR NULL +# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF) # undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF @@ -1172,9 +1248,13 @@ PyDoc_STRVAR(_ssl__SSLContext_security_level__doc__, #define _ssl__SSLContext_security_level_HAS_DOCSTR #if defined(_ssl__SSLContext_security_level_HAS_DOCSTR) -# define _ssl__SSLContext_security_level_DOCSTR _ssl__SSLContext_security_level__doc__ +# if !defined(_ssl__SSLContext_security_level_DOCSTR) +# define _ssl__SSLContext_security_level_DOCSTR _ssl__SSLContext_security_level__doc__ +# endif #else -# define _ssl__SSLContext_security_level_DOCSTR NULL +# if !defined(_ssl__SSLContext_security_level_DOCSTR) +# define _ssl__SSLContext_security_level_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF) # undef _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF @@ -1199,9 +1279,13 @@ _ssl__SSLContext_security_level_get(PySSLContext *self, void *Py_UNUSED(context) } #if defined(_ssl__SSLContext_options_HAS_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ +# if !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ +# endif #else -# define _ssl__SSLContext_options_DOCSTR NULL +# if !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF) # undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF @@ -1225,10 +1309,14 @@ _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__ +#if defined(_ssl__SSLContext_options_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ +# endif #else -# define _ssl__SSLContext_options_DOCSTR NULL +# if !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF) # undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF @@ -1253,9 +1341,13 @@ _ssl__SSLContext_options_set(PySSLContext *self, PyObject *value, void *Py_UNUSE } #if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ +# if !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ +# endif #else -# define _ssl__SSLContext__host_flags_DOCSTR NULL +# if !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF @@ -1279,10 +1371,14 @@ _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__ +#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) +# if !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ +# endif #else -# define _ssl__SSLContext__host_flags_DOCSTR NULL +# if !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF @@ -1307,9 +1403,13 @@ _ssl__SSLContext__host_flags_set(PySSLContext *self, PyObject *value, void *Py_U } #if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ +# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ +# endif #else -# define _ssl__SSLContext_check_hostname_DOCSTR NULL +# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF) # undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF @@ -1333,10 +1433,14 @@ _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__ +#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ +# endif #else -# define _ssl__SSLContext_check_hostname_DOCSTR NULL +# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF) # undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF @@ -1361,9 +1465,13 @@ _ssl__SSLContext_check_hostname_set(PySSLContext *self, PyObject *value, void *P } #if defined(_ssl__SSLContext_protocol_HAS_DOCSTR) -# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__ +# if !defined(_ssl__SSLContext_protocol_DOCSTR) +# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__ +# endif #else -# define _ssl__SSLContext_protocol_DOCSTR NULL +# if !defined(_ssl__SSLContext_protocol_DOCSTR) +# define _ssl__SSLContext_protocol_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_PROTOCOL_GETSETDEF) # undef _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF @@ -1835,9 +1943,13 @@ PyDoc_STRVAR(_ssl__SSLContext_sni_callback__doc__, #define _ssl__SSLContext_sni_callback_HAS_DOCSTR #if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ +# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ +# endif #else -# define _ssl__SSLContext_sni_callback_DOCSTR NULL +# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF) # undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF @@ -1861,10 +1973,14 @@ _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__ +#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ +# endif #else -# define _ssl__SSLContext_sni_callback_DOCSTR NULL +# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF) # undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF @@ -2157,9 +2273,13 @@ _ssl_MemoryBIO(PyTypeObject *type, PyObject *args, PyObject *kwargs) } #if defined(_ssl_MemoryBIO_pending_HAS_DOCSTR) -# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ +# if !defined(_ssl_MemoryBIO_pending_DOCSTR) +# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ +# endif #else -# define _ssl_MemoryBIO_pending_DOCSTR NULL +# if !defined(_ssl_MemoryBIO_pending_DOCSTR) +# define _ssl_MemoryBIO_pending_DOCSTR NULL +# endif #endif #if defined(_SSL_MEMORYBIO_PENDING_GETSETDEF) # undef _SSL_MEMORYBIO_PENDING_GETSETDEF @@ -2188,9 +2308,13 @@ PyDoc_STRVAR(_ssl_MemoryBIO_eof__doc__, #define _ssl_MemoryBIO_eof_HAS_DOCSTR #if defined(_ssl_MemoryBIO_eof_HAS_DOCSTR) -# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ +# if !defined(_ssl_MemoryBIO_eof_DOCSTR) +# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ +# endif #else -# define _ssl_MemoryBIO_eof_DOCSTR NULL +# if !defined(_ssl_MemoryBIO_eof_DOCSTR) +# define _ssl_MemoryBIO_eof_DOCSTR NULL +# endif #endif #if defined(_SSL_MEMORYBIO_EOF_GETSETDEF) # undef _SSL_MEMORYBIO_EOF_GETSETDEF @@ -2323,9 +2447,13 @@ PyDoc_STRVAR(_ssl_SSLSession_time__doc__, #define _ssl_SSLSession_time_HAS_DOCSTR #if defined(_ssl_SSLSession_time_HAS_DOCSTR) -# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ +# if !defined(_ssl_SSLSession_time_DOCSTR) +# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ +# endif #else -# define _ssl_SSLSession_time_DOCSTR NULL +# if !defined(_ssl_SSLSession_time_DOCSTR) +# define _ssl_SSLSession_time_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_TIME_GETSETDEF) # undef _SSL_SSLSESSION_TIME_GETSETDEF @@ -2354,9 +2482,13 @@ PyDoc_STRVAR(_ssl_SSLSession_timeout__doc__, #define _ssl_SSLSession_timeout_HAS_DOCSTR #if defined(_ssl_SSLSession_timeout_HAS_DOCSTR) -# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ +# if !defined(_ssl_SSLSession_timeout_DOCSTR) +# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ +# endif #else -# define _ssl_SSLSession_timeout_DOCSTR NULL +# if !defined(_ssl_SSLSession_timeout_DOCSTR) +# define _ssl_SSLSession_timeout_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_TIMEOUT_GETSETDEF) # undef _SSL_SSLSESSION_TIMEOUT_GETSETDEF @@ -2385,9 +2517,13 @@ PyDoc_STRVAR(_ssl_SSLSession_ticket_lifetime_hint__doc__, #define _ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR #if defined(_ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR) -# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR _ssl_SSLSession_ticket_lifetime_hint__doc__ +# if !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) +# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR _ssl_SSLSession_ticket_lifetime_hint__doc__ +# endif #else -# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR NULL +# if !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) +# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF) # undef _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF @@ -2416,9 +2552,13 @@ PyDoc_STRVAR(_ssl_SSLSession_id__doc__, #define _ssl_SSLSession_id_HAS_DOCSTR #if defined(_ssl_SSLSession_id_HAS_DOCSTR) -# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ +# if !defined(_ssl_SSLSession_id_DOCSTR) +# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ +# endif #else -# define _ssl_SSLSession_id_DOCSTR NULL +# if !defined(_ssl_SSLSession_id_DOCSTR) +# define _ssl_SSLSession_id_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_ID_GETSETDEF) # undef _SSL_SSLSESSION_ID_GETSETDEF @@ -2447,9 +2587,13 @@ PyDoc_STRVAR(_ssl_SSLSession_has_ticket__doc__, #define _ssl_SSLSession_has_ticket_HAS_DOCSTR #if defined(_ssl_SSLSession_has_ticket_HAS_DOCSTR) -# define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__ +# if !defined(_ssl_SSLSession_has_ticket_DOCSTR) +# define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__ +# endif #else -# define _ssl_SSLSession_has_ticket_DOCSTR NULL +# if !defined(_ssl_SSLSession_has_ticket_DOCSTR) +# define _ssl_SSLSession_has_ticket_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_HAS_TICKET_GETSETDEF) # undef _SSL_SSLSESSION_HAS_TICKET_GETSETDEF @@ -2898,4 +3042,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=4d56efa56bb6a3b4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e103189d2ac1d46d input=a9049054013a1b77]*/ diff --git a/Tools/clinic/libclinic/parse_args.py b/Tools/clinic/libclinic/parse_args.py index fc2d9fe987096d..653030e7f3aa2d 100644 --- a/Tools/clinic/libclinic/parse_args.py +++ b/Tools/clinic/libclinic/parse_args.py @@ -158,9 +158,13 @@ def declare_parser( """) GETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r""" #if defined({getset_basename}_HAS_DOCSTR) - # define {getset_basename}_DOCSTR {getset_basename}__doc__ + # if !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR {getset_basename}__doc__ + # endif #else - # define {getset_basename}_DOCSTR NULL + # if !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR NULL + # endif #endif #if defined({getset_name}_GETSETDEF) # undef {getset_name}_GETSETDEF @@ -170,10 +174,14 @@ 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__ + #if defined({getset_basename}_HAS_DOCSTR) + # if !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR {getset_basename}__doc__ + # endif #else - # define {getset_basename}_DOCSTR NULL + # if !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR NULL + # endif #endif #if defined({getset_name}_GETSETDEF) # undef {getset_name}_GETSETDEF From 72c475e8c1623f76810babbe6f1cd47504d3ebde Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Tue, 26 Nov 2024 16:07:57 -0500 Subject: [PATCH 14/19] Simplify the preprocessor case. --- Modules/clinic/_ssl.c.h | 434 +++++++++------------------ Tools/clinic/libclinic/parse_args.py | 24 +- 2 files changed, 153 insertions(+), 305 deletions(-) diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 5f7a0180446ff6..6cbaed8419446c 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -266,14 +266,10 @@ PyDoc_STRVAR(_ssl__SSLSocket_context__doc__, "SSLSocket before the cryptographic exchange handshake messages."); #define _ssl__SSLSocket_context_HAS_DOCSTR -#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) && !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ +#elif !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF) # undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF @@ -297,14 +293,10 @@ _ssl__SSLSocket_context_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) && !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ +#elif !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF) # undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF @@ -332,14 +324,10 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_side__doc__, "Whether this is a server-side socket."); #define _ssl__SSLSocket_server_side_HAS_DOCSTR -#if defined(_ssl__SSLSocket_server_side_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_server_side_DOCSTR) -# define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_server_side_DOCSTR) -# define _ssl__SSLSocket_server_side_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_server_side_HAS_DOCSTR) && !defined(_ssl__SSLSocket_server_side_DOCSTR) +# define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__ +#elif !defined(_ssl__SSLSocket_server_side_DOCSTR) +# define _ssl__SSLSocket_server_side_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF) # undef _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF @@ -367,14 +355,10 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_hostname__doc__, "The currently set server hostname (for SNI)."); #define _ssl__SSLSocket_server_hostname_HAS_DOCSTR -#if defined(_ssl__SSLSocket_server_hostname_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_server_hostname_DOCSTR) -# define _ssl__SSLSocket_server_hostname_DOCSTR _ssl__SSLSocket_server_hostname__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_server_hostname_DOCSTR) -# define _ssl__SSLSocket_server_hostname_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_server_hostname_HAS_DOCSTR) && !defined(_ssl__SSLSocket_server_hostname_DOCSTR) +# define _ssl__SSLSocket_server_hostname_DOCSTR _ssl__SSLSocket_server_hostname__doc__ +#elif !defined(_ssl__SSLSocket_server_hostname_DOCSTR) +# define _ssl__SSLSocket_server_hostname_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF) # undef _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF @@ -404,14 +388,10 @@ PyDoc_STRVAR(_ssl__SSLSocket_owner__doc__, "Passed as \"self\" in servername callback."); #define _ssl__SSLSocket_owner_HAS_DOCSTR -#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) && !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ +#elif !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF) # undef _SSL__SSLSOCKET_OWNER_GETSETDEF @@ -435,14 +415,10 @@ _ssl__SSLSocket_owner_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) && !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ +#elif !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF) # undef _SSL__SSLSOCKET_OWNER_GETSETDEF @@ -706,14 +682,10 @@ PyDoc_STRVAR(_ssl__SSLSocket_session__doc__, "The underlying SSLSession object."); #define _ssl__SSLSocket_session_HAS_DOCSTR -#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) && !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ +#elif !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_GETSETDEF @@ -737,14 +709,10 @@ _ssl__SSLSocket_session_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) && !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ +#elif !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_GETSETDEF @@ -772,14 +740,10 @@ PyDoc_STRVAR(_ssl__SSLSocket_session_reused__doc__, "Was the client session reused during handshake?"); #define _ssl__SSLSocket_session_reused_HAS_DOCSTR -#if defined(_ssl__SSLSocket_session_reused_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_session_reused_DOCSTR) -# define _ssl__SSLSocket_session_reused_DOCSTR _ssl__SSLSocket_session_reused__doc__ -# endif -#else -# if !defined(_ssl__SSLSocket_session_reused_DOCSTR) -# define _ssl__SSLSocket_session_reused_DOCSTR NULL -# endif +#if defined(_ssl__SSLSocket_session_reused_HAS_DOCSTR) && !defined(_ssl__SSLSocket_session_reused_DOCSTR) +# define _ssl__SSLSocket_session_reused_DOCSTR _ssl__SSLSocket_session_reused__doc__ +#elif !defined(_ssl__SSLSocket_session_reused_DOCSTR) +# define _ssl__SSLSocket_session_reused_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF @@ -927,14 +891,10 @@ _ssl__SSLContext__set_alpn_protocols(PySSLContext *self, PyObject *arg) return return_value; } -#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) && !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ +#elif !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF @@ -958,14 +918,10 @@ _ssl__SSLContext_verify_mode_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) && !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ +#elif !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF @@ -989,14 +945,10 @@ _ssl__SSLContext_verify_mode_set(PySSLContext *self, PyObject *value, void *Py_U return return_value; } -#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) && !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ +#elif !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF @@ -1020,14 +972,10 @@ _ssl__SSLContext_verify_flags_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) && !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ +#elif !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF @@ -1051,14 +999,10 @@ _ssl__SSLContext_verify_flags_set(PySSLContext *self, PyObject *value, void *Py_ return return_value; } -#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) && !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ +#elif !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF @@ -1082,14 +1026,10 @@ _ssl__SSLContext_minimum_version_get(PySSLContext *self, void *Py_UNUSED(context return return_value; } -#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) && !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ +#elif !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF @@ -1114,14 +1054,10 @@ _ssl__SSLContext_minimum_version_set(PySSLContext *self, PyObject *value, void * return return_value; } -#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) && !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ +#elif !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF @@ -1145,14 +1081,10 @@ _ssl__SSLContext_maximum_version_get(PySSLContext *self, void *Py_UNUSED(context return return_value; } -#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) && !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ +#elif !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF @@ -1181,14 +1113,10 @@ PyDoc_STRVAR(_ssl__SSLContext_num_tickets__doc__, "Control the number of TLSv1.3 session tickets."); #define _ssl__SSLContext_num_tickets_HAS_DOCSTR -#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) && !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ +#elif !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF) # undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF @@ -1212,14 +1140,10 @@ _ssl__SSLContext_num_tickets_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) && !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ +#elif !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF) # undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF @@ -1247,14 +1171,10 @@ PyDoc_STRVAR(_ssl__SSLContext_security_level__doc__, "The current security level."); #define _ssl__SSLContext_security_level_HAS_DOCSTR -#if defined(_ssl__SSLContext_security_level_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_security_level_DOCSTR) -# define _ssl__SSLContext_security_level_DOCSTR _ssl__SSLContext_security_level__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_security_level_DOCSTR) -# define _ssl__SSLContext_security_level_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_security_level_HAS_DOCSTR) && !defined(_ssl__SSLContext_security_level_DOCSTR) +# define _ssl__SSLContext_security_level_DOCSTR _ssl__SSLContext_security_level__doc__ +#elif !defined(_ssl__SSLContext_security_level_DOCSTR) +# define _ssl__SSLContext_security_level_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF) # undef _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF @@ -1278,14 +1198,10 @@ _ssl__SSLContext_security_level_get(PySSLContext *self, void *Py_UNUSED(context) return return_value; } -#if defined(_ssl__SSLContext_options_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_options_HAS_DOCSTR) && !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ +#elif !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF) # undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF @@ -1309,14 +1225,10 @@ _ssl__SSLContext_options_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_options_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_options_HAS_DOCSTR) && !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ +#elif !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF) # undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF @@ -1340,14 +1252,10 @@ _ssl__SSLContext_options_set(PySSLContext *self, PyObject *value, void *Py_UNUSE return return_value; } -#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) -# if !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ -# endif -#else -# if !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) && !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ +#elif !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF @@ -1371,14 +1279,10 @@ _ssl__SSLContext__host_flags_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) -# if !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ -# endif -#else -# if !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) && !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ +#elif !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF @@ -1402,14 +1306,10 @@ _ssl__SSLContext__host_flags_set(PySSLContext *self, PyObject *value, void *Py_U return return_value; } -#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) && !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ +#elif !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF) # undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF @@ -1433,14 +1333,10 @@ _ssl__SSLContext_check_hostname_get(PySSLContext *self, void *Py_UNUSED(context) return return_value; } -#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) && !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ +#elif !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF) # undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF @@ -1464,14 +1360,10 @@ _ssl__SSLContext_check_hostname_set(PySSLContext *self, PyObject *value, void *P return return_value; } -#if defined(_ssl__SSLContext_protocol_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_protocol_DOCSTR) -# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_protocol_DOCSTR) -# define _ssl__SSLContext_protocol_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_protocol_HAS_DOCSTR) && !defined(_ssl__SSLContext_protocol_DOCSTR) +# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__ +#elif !defined(_ssl__SSLContext_protocol_DOCSTR) +# define _ssl__SSLContext_protocol_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_PROTOCOL_GETSETDEF) # undef _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF @@ -1942,14 +1834,10 @@ PyDoc_STRVAR(_ssl__SSLContext_sni_callback__doc__, "See RFC 6066 for details of the SNI extension."); #define _ssl__SSLContext_sni_callback_HAS_DOCSTR -#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) && !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ +#elif !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF) # undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF @@ -1973,14 +1861,10 @@ _ssl__SSLContext_sni_callback_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ -# endif -#else -# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR NULL -# endif +#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) && !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ +#elif !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF) # undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF @@ -2272,14 +2156,10 @@ _ssl_MemoryBIO(PyTypeObject *type, PyObject *args, PyObject *kwargs) return return_value; } -#if defined(_ssl_MemoryBIO_pending_HAS_DOCSTR) -# if !defined(_ssl_MemoryBIO_pending_DOCSTR) -# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ -# endif -#else -# if !defined(_ssl_MemoryBIO_pending_DOCSTR) -# define _ssl_MemoryBIO_pending_DOCSTR NULL -# endif +#if defined(_ssl_MemoryBIO_pending_HAS_DOCSTR) && !defined(_ssl_MemoryBIO_pending_DOCSTR) +# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ +#elif !defined(_ssl_MemoryBIO_pending_DOCSTR) +# define _ssl_MemoryBIO_pending_DOCSTR NULL #endif #if defined(_SSL_MEMORYBIO_PENDING_GETSETDEF) # undef _SSL_MEMORYBIO_PENDING_GETSETDEF @@ -2307,14 +2187,10 @@ PyDoc_STRVAR(_ssl_MemoryBIO_eof__doc__, "Whether the memory BIO is at EOF."); #define _ssl_MemoryBIO_eof_HAS_DOCSTR -#if defined(_ssl_MemoryBIO_eof_HAS_DOCSTR) -# if !defined(_ssl_MemoryBIO_eof_DOCSTR) -# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ -# endif -#else -# if !defined(_ssl_MemoryBIO_eof_DOCSTR) -# define _ssl_MemoryBIO_eof_DOCSTR NULL -# endif +#if defined(_ssl_MemoryBIO_eof_HAS_DOCSTR) && !defined(_ssl_MemoryBIO_eof_DOCSTR) +# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ +#elif !defined(_ssl_MemoryBIO_eof_DOCSTR) +# define _ssl_MemoryBIO_eof_DOCSTR NULL #endif #if defined(_SSL_MEMORYBIO_EOF_GETSETDEF) # undef _SSL_MEMORYBIO_EOF_GETSETDEF @@ -2446,14 +2322,10 @@ PyDoc_STRVAR(_ssl_SSLSession_time__doc__, "Session creation time (seconds since epoch)."); #define _ssl_SSLSession_time_HAS_DOCSTR -#if defined(_ssl_SSLSession_time_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_time_DOCSTR) -# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ -# endif -#else -# if !defined(_ssl_SSLSession_time_DOCSTR) -# define _ssl_SSLSession_time_DOCSTR NULL -# endif +#if defined(_ssl_SSLSession_time_HAS_DOCSTR) && !defined(_ssl_SSLSession_time_DOCSTR) +# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ +#elif !defined(_ssl_SSLSession_time_DOCSTR) +# define _ssl_SSLSession_time_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_TIME_GETSETDEF) # undef _SSL_SSLSESSION_TIME_GETSETDEF @@ -2481,14 +2353,10 @@ PyDoc_STRVAR(_ssl_SSLSession_timeout__doc__, "Session timeout (delta in seconds)."); #define _ssl_SSLSession_timeout_HAS_DOCSTR -#if defined(_ssl_SSLSession_timeout_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_timeout_DOCSTR) -# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ -# endif -#else -# if !defined(_ssl_SSLSession_timeout_DOCSTR) -# define _ssl_SSLSession_timeout_DOCSTR NULL -# endif +#if defined(_ssl_SSLSession_timeout_HAS_DOCSTR) && !defined(_ssl_SSLSession_timeout_DOCSTR) +# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ +#elif !defined(_ssl_SSLSession_timeout_DOCSTR) +# define _ssl_SSLSession_timeout_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_TIMEOUT_GETSETDEF) # undef _SSL_SSLSESSION_TIMEOUT_GETSETDEF @@ -2516,14 +2384,10 @@ PyDoc_STRVAR(_ssl_SSLSession_ticket_lifetime_hint__doc__, "Ticket life time hint."); #define _ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR -#if defined(_ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) -# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR _ssl_SSLSession_ticket_lifetime_hint__doc__ -# endif -#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_HAS_DOCSTR) && !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) +# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR _ssl_SSLSession_ticket_lifetime_hint__doc__ +#elif !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) +# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF) # undef _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF @@ -2551,14 +2415,10 @@ PyDoc_STRVAR(_ssl_SSLSession_id__doc__, "Session ID."); #define _ssl_SSLSession_id_HAS_DOCSTR -#if defined(_ssl_SSLSession_id_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_id_DOCSTR) -# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ -# endif -#else -# if !defined(_ssl_SSLSession_id_DOCSTR) -# define _ssl_SSLSession_id_DOCSTR NULL -# endif +#if defined(_ssl_SSLSession_id_HAS_DOCSTR) && !defined(_ssl_SSLSession_id_DOCSTR) +# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ +#elif !defined(_ssl_SSLSession_id_DOCSTR) +# define _ssl_SSLSession_id_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_ID_GETSETDEF) # undef _SSL_SSLSESSION_ID_GETSETDEF @@ -2586,14 +2446,10 @@ PyDoc_STRVAR(_ssl_SSLSession_has_ticket__doc__, "Does the session contain a ticket?"); #define _ssl_SSLSession_has_ticket_HAS_DOCSTR -#if defined(_ssl_SSLSession_has_ticket_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_has_ticket_DOCSTR) -# define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__ -# endif -#else -# if !defined(_ssl_SSLSession_has_ticket_DOCSTR) -# define _ssl_SSLSession_has_ticket_DOCSTR NULL -# endif +#if defined(_ssl_SSLSession_has_ticket_HAS_DOCSTR) && !defined(_ssl_SSLSession_has_ticket_DOCSTR) +# define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__ +#elif !defined(_ssl_SSLSession_has_ticket_DOCSTR) +# define _ssl_SSLSession_has_ticket_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_HAS_TICKET_GETSETDEF) # undef _SSL_SSLSESSION_HAS_TICKET_GETSETDEF @@ -3042,4 +2898,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=e103189d2ac1d46d input=a9049054013a1b77]*/ +/*[clinic end generated code: output=7c36e947ce42cd3a input=a9049054013a1b77]*/ diff --git a/Tools/clinic/libclinic/parse_args.py b/Tools/clinic/libclinic/parse_args.py index 653030e7f3aa2d..12a24e8e9d048b 100644 --- a/Tools/clinic/libclinic/parse_args.py +++ b/Tools/clinic/libclinic/parse_args.py @@ -157,14 +157,10 @@ 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) - # if !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR {getset_basename}__doc__ - # endif - #else - # if !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR NULL - # endif + #if defined({getset_basename}_HAS_DOCSTR) && !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR {getset_basename}__doc__ + #elif !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR NULL #endif #if defined({getset_name}_GETSETDEF) # undef {getset_name}_GETSETDEF @@ -174,14 +170,10 @@ def declare_parser( #endif """) SETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r""" - #if defined({getset_basename}_HAS_DOCSTR) - # if !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR {getset_basename}__doc__ - # endif - #else - # if !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR NULL - # endif + #if defined({getset_basename}_HAS_DOCSTR) && !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR {getset_basename}__doc__ + #elif !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR NULL #endif #if defined({getset_name}_GETSETDEF) # undef {getset_name}_GETSETDEF From 9ec0ba9eb105c033aa230f67e88aef63423135f6 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Tue, 26 Nov 2024 16:15:00 -0500 Subject: [PATCH 15/19] Regenerate clinic test file. --- Lib/test/clinic.test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/test/clinic.test.c b/Lib/test/clinic.test.c index 4ad0b8b0910bbe..96c8fe82aa7d21 100644 --- a/Lib/test/clinic.test.c +++ b/Lib/test/clinic.test.c @@ -5303,9 +5303,9 @@ Test_meth_coexist_impl(TestObj *self) Test.property [clinic start generated code]*/ -#if defined(Test_property_HAS_DOCSTR) +#if defined(Test_property_HAS_DOCSTR) && !defined(Test_property_DOCSTR) # define Test_property_DOCSTR Test_property__doc__ -#else +#elif !defined(Test_property_DOCSTR) # define Test_property_DOCSTR NULL #endif #if defined(TEST_PROPERTY_GETSETDEF) @@ -5326,16 +5326,16 @@ 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=6badc79669979e96 input=2d92b3449fbc7d2b]*/ /*[clinic input] @setter Test.property [clinic start generated code]*/ -#if defined(TEST_PROPERTY_HAS_DOCSTR) +#if defined(Test_property_HAS_DOCSTR) && !defined(Test_property_DOCSTR) # define Test_property_DOCSTR Test_property__doc__ -#else +#elif !defined(Test_property_DOCSTR) # define Test_property_DOCSTR NULL #endif #if defined(TEST_PROPERTY_GETSETDEF) @@ -5360,7 +5360,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=da7d5420a9ff8507 input=3bc3f46a23c83a88]*/ /*[clinic input] output push From 013abedaf8c67457f4926e9d7a60d919feb69e32 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Tue, 26 Nov 2024 16:27:43 -0500 Subject: [PATCH 16/19] Restore docstring for pending. --- Modules/_ssl.c | 4 +++- Modules/clinic/_ssl.c.h | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 7b43a61b68e3e8..f6e5d06cf075b9 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5265,11 +5265,13 @@ memory_bio_dealloc(PySSLMemoryBIO *self) @critical_section @getter _ssl.MemoryBIO.pending + +The number of bytes pending in the memory BIO. [clinic start generated code]*/ static PyObject * _ssl_MemoryBIO_pending_get_impl(PySSLMemoryBIO *self) -/*[clinic end generated code: output=19236a32a51ac8ff input=c0b6d14eba107f6a]*/ +/*[clinic end generated code: output=19236a32a51ac8ff input=02d9063d8ac31732]*/ { size_t res = BIO_ctrl_pending(self->bio); return PyLong_FromSize_t(res); diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 6cbaed8419446c..d598b5c12eca28 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -2156,6 +2156,10 @@ _ssl_MemoryBIO(PyTypeObject *type, PyObject *args, PyObject *kwargs) return return_value; } +PyDoc_STRVAR(_ssl_MemoryBIO_pending__doc__, +"The number of bytes pending in the memory BIO."); +#define _ssl_MemoryBIO_pending_HAS_DOCSTR + #if defined(_ssl_MemoryBIO_pending_HAS_DOCSTR) && !defined(_ssl_MemoryBIO_pending_DOCSTR) # define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ #elif !defined(_ssl_MemoryBIO_pending_DOCSTR) @@ -2898,4 +2902,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=7c36e947ce42cd3a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=f44bca5cdedd3b22 input=a9049054013a1b77]*/ From 375f9d464762e67ee4def6049a03174c49870b04 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Fri, 29 Nov 2024 11:36:49 -0500 Subject: [PATCH 17/19] Revert "Regenerate clinic test file." This reverts commit 9ec0ba9eb105c033aa230f67e88aef63423135f6. --- Lib/test/clinic.test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/test/clinic.test.c b/Lib/test/clinic.test.c index 96c8fe82aa7d21..4ad0b8b0910bbe 100644 --- a/Lib/test/clinic.test.c +++ b/Lib/test/clinic.test.c @@ -5303,9 +5303,9 @@ Test_meth_coexist_impl(TestObj *self) Test.property [clinic start generated code]*/ -#if defined(Test_property_HAS_DOCSTR) && !defined(Test_property_DOCSTR) +#if defined(Test_property_HAS_DOCSTR) # define Test_property_DOCSTR Test_property__doc__ -#elif !defined(Test_property_DOCSTR) +#else # define Test_property_DOCSTR NULL #endif #if defined(TEST_PROPERTY_GETSETDEF) @@ -5326,16 +5326,16 @@ Test_property_get(TestObj *self, void *Py_UNUSED(context)) static PyObject * Test_property_get_impl(TestObj *self) -/*[clinic end generated code: output=6badc79669979e96 input=2d92b3449fbc7d2b]*/ +/*[clinic end generated code: output=27b519719d992e03 input=2d92b3449fbc7d2b]*/ /*[clinic input] @setter Test.property [clinic start generated code]*/ -#if defined(Test_property_HAS_DOCSTR) && !defined(Test_property_DOCSTR) +#if defined(TEST_PROPERTY_HAS_DOCSTR) # define Test_property_DOCSTR Test_property__doc__ -#elif !defined(Test_property_DOCSTR) +#else # define Test_property_DOCSTR NULL #endif #if defined(TEST_PROPERTY_GETSETDEF) @@ -5360,7 +5360,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=da7d5420a9ff8507 input=3bc3f46a23c83a88]*/ +/*[clinic end generated code: output=d51023f17c4ac3a1 input=3bc3f46a23c83a88]*/ /*[clinic input] output push From 218e7249160887faab2ae6c82e4d2e8e6f4b841c Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Fri, 29 Nov 2024 11:37:39 -0500 Subject: [PATCH 18/19] Fix merge conflicts. --- Modules/clinic/_ssl.c.h | 435 ++++++++++++++++++--------- Tools/clinic/libclinic/parse_args.py | 24 +- 2 files changed, 311 insertions(+), 148 deletions(-) diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index d598b5c12eca28..90c0c8a4e90fe1 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -266,10 +266,14 @@ PyDoc_STRVAR(_ssl__SSLSocket_context__doc__, "SSLSocket before the cryptographic exchange handshake messages."); #define _ssl__SSLSocket_context_HAS_DOCSTR -#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) && !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ -#elif !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR NULL +#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF) # undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF @@ -293,10 +297,14 @@ _ssl__SSLSocket_context_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) && !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ -#elif !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR NULL +#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_context_DOCSTR) +# define _ssl__SSLSocket_context_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF) # undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF @@ -324,10 +332,14 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_side__doc__, "Whether this is a server-side socket."); #define _ssl__SSLSocket_server_side_HAS_DOCSTR -#if defined(_ssl__SSLSocket_server_side_HAS_DOCSTR) && !defined(_ssl__SSLSocket_server_side_DOCSTR) -# define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__ -#elif !defined(_ssl__SSLSocket_server_side_DOCSTR) -# define _ssl__SSLSocket_server_side_DOCSTR NULL +#if defined(_ssl__SSLSocket_server_side_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_server_side_DOCSTR) +# define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_server_side_DOCSTR) +# define _ssl__SSLSocket_server_side_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF) # undef _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF @@ -355,10 +367,14 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_hostname__doc__, "The currently set server hostname (for SNI)."); #define _ssl__SSLSocket_server_hostname_HAS_DOCSTR -#if defined(_ssl__SSLSocket_server_hostname_HAS_DOCSTR) && !defined(_ssl__SSLSocket_server_hostname_DOCSTR) -# define _ssl__SSLSocket_server_hostname_DOCSTR _ssl__SSLSocket_server_hostname__doc__ -#elif !defined(_ssl__SSLSocket_server_hostname_DOCSTR) -# define _ssl__SSLSocket_server_hostname_DOCSTR NULL +#if defined(_ssl__SSLSocket_server_hostname_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_server_hostname_DOCSTR) +# define _ssl__SSLSocket_server_hostname_DOCSTR _ssl__SSLSocket_server_hostname__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_server_hostname_DOCSTR) +# define _ssl__SSLSocket_server_hostname_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF) # undef _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF @@ -388,10 +404,14 @@ PyDoc_STRVAR(_ssl__SSLSocket_owner__doc__, "Passed as \"self\" in servername callback."); #define _ssl__SSLSocket_owner_HAS_DOCSTR -#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) && !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ -#elif !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR NULL +#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF) # undef _SSL__SSLSOCKET_OWNER_GETSETDEF @@ -415,10 +435,14 @@ _ssl__SSLSocket_owner_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) && !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ -#elif !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR NULL +#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_owner_DOCSTR) +# define _ssl__SSLSocket_owner_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF) # undef _SSL__SSLSOCKET_OWNER_GETSETDEF @@ -682,10 +706,14 @@ PyDoc_STRVAR(_ssl__SSLSocket_session__doc__, "The underlying SSLSession object."); #define _ssl__SSLSocket_session_HAS_DOCSTR -#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) && !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ -#elif !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR NULL +#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_GETSETDEF @@ -709,10 +737,14 @@ _ssl__SSLSocket_session_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) && !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ -#elif !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR NULL +#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_session_DOCSTR) +# define _ssl__SSLSocket_session_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_GETSETDEF @@ -740,10 +772,14 @@ PyDoc_STRVAR(_ssl__SSLSocket_session_reused__doc__, "Was the client session reused during handshake?"); #define _ssl__SSLSocket_session_reused_HAS_DOCSTR -#if defined(_ssl__SSLSocket_session_reused_HAS_DOCSTR) && !defined(_ssl__SSLSocket_session_reused_DOCSTR) -# define _ssl__SSLSocket_session_reused_DOCSTR _ssl__SSLSocket_session_reused__doc__ -#elif !defined(_ssl__SSLSocket_session_reused_DOCSTR) -# define _ssl__SSLSocket_session_reused_DOCSTR NULL +#if defined(_ssl__SSLSocket_session_reused_HAS_DOCSTR) +# if !defined(_ssl__SSLSocket_session_reused_DOCSTR) +# define _ssl__SSLSocket_session_reused_DOCSTR _ssl__SSLSocket_session_reused__doc__ +# endif +#else +# if !defined(_ssl__SSLSocket_session_reused_DOCSTR) +# define _ssl__SSLSocket_session_reused_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF @@ -891,10 +927,14 @@ _ssl__SSLContext__set_alpn_protocols(PySSLContext *self, PyObject *arg) return return_value; } -#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) && !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ -#elif !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR NULL +#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF @@ -918,10 +958,14 @@ _ssl__SSLContext_verify_mode_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) && !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ -#elif !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR NULL +#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) +# define _ssl__SSLContext_verify_mode_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF @@ -945,10 +989,14 @@ _ssl__SSLContext_verify_mode_set(PySSLContext *self, PyObject *value, void *Py_U return return_value; } -#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) && !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ -#elif !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR NULL +#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF @@ -972,10 +1020,14 @@ _ssl__SSLContext_verify_flags_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) && !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ -#elif !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR NULL +#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) +# define _ssl__SSLContext_verify_flags_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF @@ -999,10 +1051,14 @@ _ssl__SSLContext_verify_flags_set(PySSLContext *self, PyObject *value, void *Py_ return return_value; } -#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) && !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ -#elif !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR NULL +#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF @@ -1026,10 +1082,14 @@ _ssl__SSLContext_minimum_version_get(PySSLContext *self, void *Py_UNUSED(context return return_value; } -#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) && !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ -#elif !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR NULL +#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) +# define _ssl__SSLContext_minimum_version_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF @@ -1054,10 +1114,14 @@ _ssl__SSLContext_minimum_version_set(PySSLContext *self, PyObject *value, void * return return_value; } -#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) && !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ -#elif !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR NULL +#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF @@ -1081,10 +1145,14 @@ _ssl__SSLContext_maximum_version_get(PySSLContext *self, void *Py_UNUSED(context return return_value; } -#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) && !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ -#elif !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR NULL +#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) +# define _ssl__SSLContext_maximum_version_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF @@ -1113,10 +1181,14 @@ PyDoc_STRVAR(_ssl__SSLContext_num_tickets__doc__, "Control the number of TLSv1.3 session tickets."); #define _ssl__SSLContext_num_tickets_HAS_DOCSTR -#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) && !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ -#elif !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR NULL +#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF) # undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF @@ -1140,10 +1212,14 @@ _ssl__SSLContext_num_tickets_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) && !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ -#elif !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR NULL +#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) +# define _ssl__SSLContext_num_tickets_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF) # undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF @@ -1171,10 +1247,14 @@ PyDoc_STRVAR(_ssl__SSLContext_security_level__doc__, "The current security level."); #define _ssl__SSLContext_security_level_HAS_DOCSTR -#if defined(_ssl__SSLContext_security_level_HAS_DOCSTR) && !defined(_ssl__SSLContext_security_level_DOCSTR) -# define _ssl__SSLContext_security_level_DOCSTR _ssl__SSLContext_security_level__doc__ -#elif !defined(_ssl__SSLContext_security_level_DOCSTR) -# define _ssl__SSLContext_security_level_DOCSTR NULL +#if defined(_ssl__SSLContext_security_level_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_security_level_DOCSTR) +# define _ssl__SSLContext_security_level_DOCSTR _ssl__SSLContext_security_level__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_security_level_DOCSTR) +# define _ssl__SSLContext_security_level_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF) # undef _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF @@ -1198,10 +1278,14 @@ _ssl__SSLContext_security_level_get(PySSLContext *self, void *Py_UNUSED(context) return return_value; } -#if defined(_ssl__SSLContext_options_HAS_DOCSTR) && !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ -#elif !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR NULL +#if defined(_ssl__SSLContext_options_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF) # undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF @@ -1225,10 +1309,14 @@ _ssl__SSLContext_options_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_options_HAS_DOCSTR) && !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ -#elif !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR NULL +#if defined(_ssl__SSLContext_options_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_options_DOCSTR) +# define _ssl__SSLContext_options_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF) # undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF @@ -1252,10 +1340,14 @@ _ssl__SSLContext_options_set(PySSLContext *self, PyObject *value, void *Py_UNUSE return return_value; } -#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) && !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ -#elif !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR NULL +#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) +# if !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ +# endif +#else +# if !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF @@ -1279,10 +1371,14 @@ _ssl__SSLContext__host_flags_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) && !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ -#elif !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR NULL +#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) +# if !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ +# endif +#else +# if !defined(_ssl__SSLContext__host_flags_DOCSTR) +# define _ssl__SSLContext__host_flags_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF @@ -1306,10 +1402,14 @@ _ssl__SSLContext__host_flags_set(PySSLContext *self, PyObject *value, void *Py_U return return_value; } -#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) && !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ -#elif !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR NULL +#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF) # undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF @@ -1333,10 +1433,14 @@ _ssl__SSLContext_check_hostname_get(PySSLContext *self, void *Py_UNUSED(context) return return_value; } -#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) && !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ -#elif !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR NULL +#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) +# define _ssl__SSLContext_check_hostname_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF) # undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF @@ -1360,10 +1464,14 @@ _ssl__SSLContext_check_hostname_set(PySSLContext *self, PyObject *value, void *P return return_value; } -#if defined(_ssl__SSLContext_protocol_HAS_DOCSTR) && !defined(_ssl__SSLContext_protocol_DOCSTR) -# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__ -#elif !defined(_ssl__SSLContext_protocol_DOCSTR) -# define _ssl__SSLContext_protocol_DOCSTR NULL +#if defined(_ssl__SSLContext_protocol_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_protocol_DOCSTR) +# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_protocol_DOCSTR) +# define _ssl__SSLContext_protocol_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_PROTOCOL_GETSETDEF) # undef _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF @@ -1834,10 +1942,14 @@ PyDoc_STRVAR(_ssl__SSLContext_sni_callback__doc__, "See RFC 6066 for details of the SNI extension."); #define _ssl__SSLContext_sni_callback_HAS_DOCSTR -#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) && !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ -#elif !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR NULL +#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF) # undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF @@ -1861,10 +1973,14 @@ _ssl__SSLContext_sni_callback_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) && !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ -#elif !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR NULL +#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) +# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ +# endif +#else +# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) +# define _ssl__SSLContext_sni_callback_DOCSTR NULL +# endif #endif #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF) # undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF @@ -2156,6 +2272,7 @@ _ssl_MemoryBIO(PyTypeObject *type, PyObject *args, PyObject *kwargs) return return_value; } +<<<<<<< HEAD PyDoc_STRVAR(_ssl_MemoryBIO_pending__doc__, "The number of bytes pending in the memory BIO."); #define _ssl_MemoryBIO_pending_HAS_DOCSTR @@ -2164,6 +2281,16 @@ PyDoc_STRVAR(_ssl_MemoryBIO_pending__doc__, # define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ #elif !defined(_ssl_MemoryBIO_pending_DOCSTR) # define _ssl_MemoryBIO_pending_DOCSTR NULL +======= +#if defined(_ssl_MemoryBIO_pending_HAS_DOCSTR) +# if !defined(_ssl_MemoryBIO_pending_DOCSTR) +# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ +# endif +#else +# if !defined(_ssl_MemoryBIO_pending_DOCSTR) +# define _ssl_MemoryBIO_pending_DOCSTR NULL +# endif +>>>>>>> parent of 72c475e8c16 (Simplify the preprocessor case.) #endif #if defined(_SSL_MEMORYBIO_PENDING_GETSETDEF) # undef _SSL_MEMORYBIO_PENDING_GETSETDEF @@ -2191,10 +2318,14 @@ PyDoc_STRVAR(_ssl_MemoryBIO_eof__doc__, "Whether the memory BIO is at EOF."); #define _ssl_MemoryBIO_eof_HAS_DOCSTR -#if defined(_ssl_MemoryBIO_eof_HAS_DOCSTR) && !defined(_ssl_MemoryBIO_eof_DOCSTR) -# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ -#elif !defined(_ssl_MemoryBIO_eof_DOCSTR) -# define _ssl_MemoryBIO_eof_DOCSTR NULL +#if defined(_ssl_MemoryBIO_eof_HAS_DOCSTR) +# if !defined(_ssl_MemoryBIO_eof_DOCSTR) +# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ +# endif +#else +# if !defined(_ssl_MemoryBIO_eof_DOCSTR) +# define _ssl_MemoryBIO_eof_DOCSTR NULL +# endif #endif #if defined(_SSL_MEMORYBIO_EOF_GETSETDEF) # undef _SSL_MEMORYBIO_EOF_GETSETDEF @@ -2326,10 +2457,14 @@ PyDoc_STRVAR(_ssl_SSLSession_time__doc__, "Session creation time (seconds since epoch)."); #define _ssl_SSLSession_time_HAS_DOCSTR -#if defined(_ssl_SSLSession_time_HAS_DOCSTR) && !defined(_ssl_SSLSession_time_DOCSTR) -# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ -#elif !defined(_ssl_SSLSession_time_DOCSTR) -# define _ssl_SSLSession_time_DOCSTR NULL +#if defined(_ssl_SSLSession_time_HAS_DOCSTR) +# if !defined(_ssl_SSLSession_time_DOCSTR) +# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ +# endif +#else +# if !defined(_ssl_SSLSession_time_DOCSTR) +# define _ssl_SSLSession_time_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_TIME_GETSETDEF) # undef _SSL_SSLSESSION_TIME_GETSETDEF @@ -2357,10 +2492,14 @@ PyDoc_STRVAR(_ssl_SSLSession_timeout__doc__, "Session timeout (delta in seconds)."); #define _ssl_SSLSession_timeout_HAS_DOCSTR -#if defined(_ssl_SSLSession_timeout_HAS_DOCSTR) && !defined(_ssl_SSLSession_timeout_DOCSTR) -# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ -#elif !defined(_ssl_SSLSession_timeout_DOCSTR) -# define _ssl_SSLSession_timeout_DOCSTR NULL +#if defined(_ssl_SSLSession_timeout_HAS_DOCSTR) +# if !defined(_ssl_SSLSession_timeout_DOCSTR) +# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ +# endif +#else +# if !defined(_ssl_SSLSession_timeout_DOCSTR) +# define _ssl_SSLSession_timeout_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_TIMEOUT_GETSETDEF) # undef _SSL_SSLSESSION_TIMEOUT_GETSETDEF @@ -2388,10 +2527,14 @@ PyDoc_STRVAR(_ssl_SSLSession_ticket_lifetime_hint__doc__, "Ticket life time hint."); #define _ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR -#if defined(_ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR) && !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) -# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR _ssl_SSLSession_ticket_lifetime_hint__doc__ -#elif !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) -# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR NULL +#if defined(_ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR) +# if !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) +# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR _ssl_SSLSession_ticket_lifetime_hint__doc__ +# endif +#else +# if !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) +# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF) # undef _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF @@ -2419,10 +2562,14 @@ PyDoc_STRVAR(_ssl_SSLSession_id__doc__, "Session ID."); #define _ssl_SSLSession_id_HAS_DOCSTR -#if defined(_ssl_SSLSession_id_HAS_DOCSTR) && !defined(_ssl_SSLSession_id_DOCSTR) -# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ -#elif !defined(_ssl_SSLSession_id_DOCSTR) -# define _ssl_SSLSession_id_DOCSTR NULL +#if defined(_ssl_SSLSession_id_HAS_DOCSTR) +# if !defined(_ssl_SSLSession_id_DOCSTR) +# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ +# endif +#else +# if !defined(_ssl_SSLSession_id_DOCSTR) +# define _ssl_SSLSession_id_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_ID_GETSETDEF) # undef _SSL_SSLSESSION_ID_GETSETDEF @@ -2450,10 +2597,14 @@ PyDoc_STRVAR(_ssl_SSLSession_has_ticket__doc__, "Does the session contain a ticket?"); #define _ssl_SSLSession_has_ticket_HAS_DOCSTR -#if defined(_ssl_SSLSession_has_ticket_HAS_DOCSTR) && !defined(_ssl_SSLSession_has_ticket_DOCSTR) -# define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__ -#elif !defined(_ssl_SSLSession_has_ticket_DOCSTR) -# define _ssl_SSLSession_has_ticket_DOCSTR NULL +#if defined(_ssl_SSLSession_has_ticket_HAS_DOCSTR) +# if !defined(_ssl_SSLSession_has_ticket_DOCSTR) +# define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__ +# endif +#else +# if !defined(_ssl_SSLSession_has_ticket_DOCSTR) +# define _ssl_SSLSession_has_ticket_DOCSTR NULL +# endif #endif #if defined(_SSL_SSLSESSION_HAS_TICKET_GETSETDEF) # undef _SSL_SSLSESSION_HAS_TICKET_GETSETDEF @@ -2902,4 +3053,8 @@ _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) */ +<<<<<<< HEAD /*[clinic end generated code: output=f44bca5cdedd3b22 input=a9049054013a1b77]*/ +======= +/*[clinic end generated code: output=e103189d2ac1d46d input=a9049054013a1b77]*/ +>>>>>>> parent of 72c475e8c16 (Simplify the preprocessor case.) diff --git a/Tools/clinic/libclinic/parse_args.py b/Tools/clinic/libclinic/parse_args.py index 12a24e8e9d048b..653030e7f3aa2d 100644 --- a/Tools/clinic/libclinic/parse_args.py +++ b/Tools/clinic/libclinic/parse_args.py @@ -157,10 +157,14 @@ 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) && !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR {getset_basename}__doc__ - #elif !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR NULL + #if defined({getset_basename}_HAS_DOCSTR) + # if !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR {getset_basename}__doc__ + # endif + #else + # if !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR NULL + # endif #endif #if defined({getset_name}_GETSETDEF) # undef {getset_name}_GETSETDEF @@ -170,10 +174,14 @@ def declare_parser( #endif """) SETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r""" - #if defined({getset_basename}_HAS_DOCSTR) && !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR {getset_basename}__doc__ - #elif !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR NULL + #if defined({getset_basename}_HAS_DOCSTR) + # if !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR {getset_basename}__doc__ + # endif + #else + # if !defined({getset_basename}_DOCSTR) + # define {getset_basename}_DOCSTR NULL + # endif #endif #if defined({getset_name}_GETSETDEF) # undef {getset_name}_GETSETDEF From d5dafd147564f3a401db2f2ac71c56e966bf5d23 Mon Sep 17 00:00:00 2001 From: Peter Bierma Date: Fri, 29 Nov 2024 11:39:18 -0500 Subject: [PATCH 19/19] Revert the original clinic fix. --- Modules/clinic/_ssl.c.h | 325 +++++++-------------------- Tools/clinic/libclinic/parse_args.py | 18 +- 2 files changed, 90 insertions(+), 253 deletions(-) diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 90c0c8a4e90fe1..d3aabf0cfa5ac6 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -267,13 +267,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_context__doc__, #define _ssl__SSLSocket_context_HAS_DOCSTR #if defined(_ssl__SSLSocket_context_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ -# endif +# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ #else -# if !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR NULL -# endif +# define _ssl__SSLSocket_context_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF) # undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF @@ -297,14 +293,10 @@ _ssl__SSLSocket_context_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_context_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_context_DOCSTR) -# define _ssl__SSLSocket_context_DOCSTR _ssl__SSLSocket_context__doc__ -# endif +#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 +# define _ssl__SSLSocket_context_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_CONTEXT_GETSETDEF) # undef _SSL__SSLSOCKET_CONTEXT_GETSETDEF @@ -333,13 +325,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_side__doc__, #define _ssl__SSLSocket_server_side_HAS_DOCSTR #if defined(_ssl__SSLSocket_server_side_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_server_side_DOCSTR) -# define _ssl__SSLSocket_server_side_DOCSTR _ssl__SSLSocket_server_side__doc__ -# endif +# 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 +# define _ssl__SSLSocket_server_side_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF) # undef _SSL__SSLSOCKET_SERVER_SIDE_GETSETDEF @@ -368,13 +356,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_server_hostname__doc__, #define _ssl__SSLSocket_server_hostname_HAS_DOCSTR #if defined(_ssl__SSLSocket_server_hostname_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_server_hostname_DOCSTR) -# define _ssl__SSLSocket_server_hostname_DOCSTR _ssl__SSLSocket_server_hostname__doc__ -# endif +# 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 +# define _ssl__SSLSocket_server_hostname_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF) # undef _SSL__SSLSOCKET_SERVER_HOSTNAME_GETSETDEF @@ -405,13 +389,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_owner__doc__, #define _ssl__SSLSocket_owner_HAS_DOCSTR #if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ -# endif +# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ #else -# if !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR NULL -# endif +# define _ssl__SSLSocket_owner_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF) # undef _SSL__SSLSOCKET_OWNER_GETSETDEF @@ -435,14 +415,10 @@ _ssl__SSLSocket_owner_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_owner_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_owner_DOCSTR) -# define _ssl__SSLSocket_owner_DOCSTR _ssl__SSLSocket_owner__doc__ -# endif +#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 +# define _ssl__SSLSocket_owner_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_OWNER_GETSETDEF) # undef _SSL__SSLSOCKET_OWNER_GETSETDEF @@ -707,13 +683,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_session__doc__, #define _ssl__SSLSocket_session_HAS_DOCSTR #if defined(_ssl__SSLSocket_session_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ -# endif +# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ #else -# if !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR NULL -# endif +# define _ssl__SSLSocket_session_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_GETSETDEF @@ -737,14 +709,10 @@ _ssl__SSLSocket_session_get(PySSLSocket *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLSocket_session_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_session_DOCSTR) -# define _ssl__SSLSocket_session_DOCSTR _ssl__SSLSocket_session__doc__ -# endif +#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 +# define _ssl__SSLSocket_session_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SESSION_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_GETSETDEF @@ -773,13 +741,9 @@ PyDoc_STRVAR(_ssl__SSLSocket_session_reused__doc__, #define _ssl__SSLSocket_session_reused_HAS_DOCSTR #if defined(_ssl__SSLSocket_session_reused_HAS_DOCSTR) -# if !defined(_ssl__SSLSocket_session_reused_DOCSTR) -# define _ssl__SSLSocket_session_reused_DOCSTR _ssl__SSLSocket_session_reused__doc__ -# endif +# 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 +# define _ssl__SSLSocket_session_reused_DOCSTR NULL #endif #if defined(_SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF) # undef _SSL__SSLSOCKET_SESSION_REUSED_GETSETDEF @@ -928,13 +892,9 @@ _ssl__SSLContext__set_alpn_protocols(PySSLContext *self, PyObject *arg) } #if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ -# endif +# 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 +# define _ssl__SSLContext_verify_mode_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF @@ -958,14 +918,10 @@ _ssl__SSLContext_verify_mode_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_verify_mode_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_verify_mode_DOCSTR) -# define _ssl__SSLContext_verify_mode_DOCSTR _ssl__SSLContext_verify_mode__doc__ -# endif +#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 +# define _ssl__SSLContext_verify_mode_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_MODE_GETSETDEF @@ -990,13 +946,9 @@ _ssl__SSLContext_verify_mode_set(PySSLContext *self, PyObject *value, void *Py_U } #if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ -# endif +# 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 +# define _ssl__SSLContext_verify_flags_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF @@ -1020,14 +972,10 @@ _ssl__SSLContext_verify_flags_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_verify_flags_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_verify_flags_DOCSTR) -# define _ssl__SSLContext_verify_flags_DOCSTR _ssl__SSLContext_verify_flags__doc__ -# endif +#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 +# define _ssl__SSLContext_verify_flags_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT_VERIFY_FLAGS_GETSETDEF @@ -1052,13 +1000,9 @@ _ssl__SSLContext_verify_flags_set(PySSLContext *self, PyObject *value, void *Py_ } #if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ -# endif +# 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 +# define _ssl__SSLContext_minimum_version_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF @@ -1082,14 +1026,10 @@ _ssl__SSLContext_minimum_version_get(PySSLContext *self, void *Py_UNUSED(context return return_value; } -#if defined(_ssl__SSLContext_minimum_version_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_minimum_version_DOCSTR) -# define _ssl__SSLContext_minimum_version_DOCSTR _ssl__SSLContext_minimum_version__doc__ -# endif +#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 +# define _ssl__SSLContext_minimum_version_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MINIMUM_VERSION_GETSETDEF @@ -1115,13 +1055,9 @@ _ssl__SSLContext_minimum_version_set(PySSLContext *self, PyObject *value, void * } #if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ -# endif +# 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 +# define _ssl__SSLContext_maximum_version_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF @@ -1145,14 +1081,10 @@ _ssl__SSLContext_maximum_version_get(PySSLContext *self, void *Py_UNUSED(context return return_value; } -#if defined(_ssl__SSLContext_maximum_version_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_maximum_version_DOCSTR) -# define _ssl__SSLContext_maximum_version_DOCSTR _ssl__SSLContext_maximum_version__doc__ -# endif +#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 +# define _ssl__SSLContext_maximum_version_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF) # undef _SSL__SSLCONTEXT_MAXIMUM_VERSION_GETSETDEF @@ -1182,13 +1114,9 @@ PyDoc_STRVAR(_ssl__SSLContext_num_tickets__doc__, #define _ssl__SSLContext_num_tickets_HAS_DOCSTR #if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ -# endif +# 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 +# define _ssl__SSLContext_num_tickets_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF) # undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF @@ -1212,14 +1140,10 @@ _ssl__SSLContext_num_tickets_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_num_tickets_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_num_tickets_DOCSTR) -# define _ssl__SSLContext_num_tickets_DOCSTR _ssl__SSLContext_num_tickets__doc__ -# endif +#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 +# define _ssl__SSLContext_num_tickets_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF) # undef _SSL__SSLCONTEXT_NUM_TICKETS_GETSETDEF @@ -1248,13 +1172,9 @@ PyDoc_STRVAR(_ssl__SSLContext_security_level__doc__, #define _ssl__SSLContext_security_level_HAS_DOCSTR #if defined(_ssl__SSLContext_security_level_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_security_level_DOCSTR) -# define _ssl__SSLContext_security_level_DOCSTR _ssl__SSLContext_security_level__doc__ -# endif +# 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 +# define _ssl__SSLContext_security_level_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF) # undef _SSL__SSLCONTEXT_SECURITY_LEVEL_GETSETDEF @@ -1279,13 +1199,9 @@ _ssl__SSLContext_security_level_get(PySSLContext *self, void *Py_UNUSED(context) } #if defined(_ssl__SSLContext_options_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ -# endif +# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ #else -# if !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR NULL -# endif +# define _ssl__SSLContext_options_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF) # undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF @@ -1309,14 +1225,10 @@ _ssl__SSLContext_options_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_options_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_options_DOCSTR) -# define _ssl__SSLContext_options_DOCSTR _ssl__SSLContext_options__doc__ -# endif +#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 +# define _ssl__SSLContext_options_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_OPTIONS_GETSETDEF) # undef _SSL__SSLCONTEXT_OPTIONS_GETSETDEF @@ -1341,13 +1253,9 @@ _ssl__SSLContext_options_set(PySSLContext *self, PyObject *value, void *Py_UNUSE } #if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) -# if !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ -# endif +# 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 +# define _ssl__SSLContext__host_flags_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF @@ -1371,14 +1279,10 @@ _ssl__SSLContext__host_flags_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext__host_flags_HAS_DOCSTR) -# if !defined(_ssl__SSLContext__host_flags_DOCSTR) -# define _ssl__SSLContext__host_flags_DOCSTR _ssl__SSLContext__host_flags__doc__ -# endif +#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 +# define _ssl__SSLContext__host_flags_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF) # undef _SSL__SSLCONTEXT__HOST_FLAGS_GETSETDEF @@ -1403,13 +1307,9 @@ _ssl__SSLContext__host_flags_set(PySSLContext *self, PyObject *value, void *Py_U } #if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ -# endif +# 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 +# define _ssl__SSLContext_check_hostname_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF) # undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF @@ -1433,14 +1333,10 @@ _ssl__SSLContext_check_hostname_get(PySSLContext *self, void *Py_UNUSED(context) return return_value; } -#if defined(_ssl__SSLContext_check_hostname_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_check_hostname_DOCSTR) -# define _ssl__SSLContext_check_hostname_DOCSTR _ssl__SSLContext_check_hostname__doc__ -# endif +#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 +# define _ssl__SSLContext_check_hostname_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF) # undef _SSL__SSLCONTEXT_CHECK_HOSTNAME_GETSETDEF @@ -1465,13 +1361,9 @@ _ssl__SSLContext_check_hostname_set(PySSLContext *self, PyObject *value, void *P } #if defined(_ssl__SSLContext_protocol_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_protocol_DOCSTR) -# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__ -# endif +# define _ssl__SSLContext_protocol_DOCSTR _ssl__SSLContext_protocol__doc__ #else -# if !defined(_ssl__SSLContext_protocol_DOCSTR) -# define _ssl__SSLContext_protocol_DOCSTR NULL -# endif +# define _ssl__SSLContext_protocol_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_PROTOCOL_GETSETDEF) # undef _SSL__SSLCONTEXT_PROTOCOL_GETSETDEF @@ -1943,13 +1835,9 @@ PyDoc_STRVAR(_ssl__SSLContext_sni_callback__doc__, #define _ssl__SSLContext_sni_callback_HAS_DOCSTR #if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ -# endif +# 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 +# define _ssl__SSLContext_sni_callback_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF) # undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF @@ -1973,14 +1861,10 @@ _ssl__SSLContext_sni_callback_get(PySSLContext *self, void *Py_UNUSED(context)) return return_value; } -#if defined(_ssl__SSLContext_sni_callback_HAS_DOCSTR) -# if !defined(_ssl__SSLContext_sni_callback_DOCSTR) -# define _ssl__SSLContext_sni_callback_DOCSTR _ssl__SSLContext_sni_callback__doc__ -# endif +#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 +# define _ssl__SSLContext_sni_callback_DOCSTR NULL #endif #if defined(_SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF) # undef _SSL__SSLCONTEXT_SNI_CALLBACK_GETSETDEF @@ -2272,25 +2156,14 @@ _ssl_MemoryBIO(PyTypeObject *type, PyObject *args, PyObject *kwargs) return return_value; } -<<<<<<< HEAD PyDoc_STRVAR(_ssl_MemoryBIO_pending__doc__, "The number of bytes pending in the memory BIO."); #define _ssl_MemoryBIO_pending_HAS_DOCSTR -#if defined(_ssl_MemoryBIO_pending_HAS_DOCSTR) && !defined(_ssl_MemoryBIO_pending_DOCSTR) -# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ -#elif !defined(_ssl_MemoryBIO_pending_DOCSTR) -# define _ssl_MemoryBIO_pending_DOCSTR NULL -======= #if defined(_ssl_MemoryBIO_pending_HAS_DOCSTR) -# if !defined(_ssl_MemoryBIO_pending_DOCSTR) -# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ -# endif +# define _ssl_MemoryBIO_pending_DOCSTR _ssl_MemoryBIO_pending__doc__ #else -# if !defined(_ssl_MemoryBIO_pending_DOCSTR) -# define _ssl_MemoryBIO_pending_DOCSTR NULL -# endif ->>>>>>> parent of 72c475e8c16 (Simplify the preprocessor case.) +# define _ssl_MemoryBIO_pending_DOCSTR NULL #endif #if defined(_SSL_MEMORYBIO_PENDING_GETSETDEF) # undef _SSL_MEMORYBIO_PENDING_GETSETDEF @@ -2319,13 +2192,9 @@ PyDoc_STRVAR(_ssl_MemoryBIO_eof__doc__, #define _ssl_MemoryBIO_eof_HAS_DOCSTR #if defined(_ssl_MemoryBIO_eof_HAS_DOCSTR) -# if !defined(_ssl_MemoryBIO_eof_DOCSTR) -# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ -# endif +# define _ssl_MemoryBIO_eof_DOCSTR _ssl_MemoryBIO_eof__doc__ #else -# if !defined(_ssl_MemoryBIO_eof_DOCSTR) -# define _ssl_MemoryBIO_eof_DOCSTR NULL -# endif +# define _ssl_MemoryBIO_eof_DOCSTR NULL #endif #if defined(_SSL_MEMORYBIO_EOF_GETSETDEF) # undef _SSL_MEMORYBIO_EOF_GETSETDEF @@ -2458,13 +2327,9 @@ PyDoc_STRVAR(_ssl_SSLSession_time__doc__, #define _ssl_SSLSession_time_HAS_DOCSTR #if defined(_ssl_SSLSession_time_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_time_DOCSTR) -# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ -# endif +# define _ssl_SSLSession_time_DOCSTR _ssl_SSLSession_time__doc__ #else -# if !defined(_ssl_SSLSession_time_DOCSTR) -# define _ssl_SSLSession_time_DOCSTR NULL -# endif +# define _ssl_SSLSession_time_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_TIME_GETSETDEF) # undef _SSL_SSLSESSION_TIME_GETSETDEF @@ -2493,13 +2358,9 @@ PyDoc_STRVAR(_ssl_SSLSession_timeout__doc__, #define _ssl_SSLSession_timeout_HAS_DOCSTR #if defined(_ssl_SSLSession_timeout_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_timeout_DOCSTR) -# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ -# endif +# define _ssl_SSLSession_timeout_DOCSTR _ssl_SSLSession_timeout__doc__ #else -# if !defined(_ssl_SSLSession_timeout_DOCSTR) -# define _ssl_SSLSession_timeout_DOCSTR NULL -# endif +# define _ssl_SSLSession_timeout_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_TIMEOUT_GETSETDEF) # undef _SSL_SSLSESSION_TIMEOUT_GETSETDEF @@ -2528,13 +2389,9 @@ PyDoc_STRVAR(_ssl_SSLSession_ticket_lifetime_hint__doc__, #define _ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR #if defined(_ssl_SSLSession_ticket_lifetime_hint_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_ticket_lifetime_hint_DOCSTR) -# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR _ssl_SSLSession_ticket_lifetime_hint__doc__ -# endif +# 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 +# define _ssl_SSLSession_ticket_lifetime_hint_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF) # undef _SSL_SSLSESSION_TICKET_LIFETIME_HINT_GETSETDEF @@ -2563,13 +2420,9 @@ PyDoc_STRVAR(_ssl_SSLSession_id__doc__, #define _ssl_SSLSession_id_HAS_DOCSTR #if defined(_ssl_SSLSession_id_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_id_DOCSTR) -# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ -# endif +# define _ssl_SSLSession_id_DOCSTR _ssl_SSLSession_id__doc__ #else -# if !defined(_ssl_SSLSession_id_DOCSTR) -# define _ssl_SSLSession_id_DOCSTR NULL -# endif +# define _ssl_SSLSession_id_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_ID_GETSETDEF) # undef _SSL_SSLSESSION_ID_GETSETDEF @@ -2598,13 +2451,9 @@ PyDoc_STRVAR(_ssl_SSLSession_has_ticket__doc__, #define _ssl_SSLSession_has_ticket_HAS_DOCSTR #if defined(_ssl_SSLSession_has_ticket_HAS_DOCSTR) -# if !defined(_ssl_SSLSession_has_ticket_DOCSTR) -# define _ssl_SSLSession_has_ticket_DOCSTR _ssl_SSLSession_has_ticket__doc__ -# endif +# 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 +# define _ssl_SSLSession_has_ticket_DOCSTR NULL #endif #if defined(_SSL_SSLSESSION_HAS_TICKET_GETSETDEF) # undef _SSL_SSLSESSION_HAS_TICKET_GETSETDEF @@ -3053,8 +2902,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) */ -<<<<<<< HEAD -/*[clinic end generated code: output=f44bca5cdedd3b22 input=a9049054013a1b77]*/ -======= -/*[clinic end generated code: output=e103189d2ac1d46d input=a9049054013a1b77]*/ ->>>>>>> parent of 72c475e8c16 (Simplify the preprocessor case.) +/*[clinic end generated code: output=5b197cbbfbba4a3a input=a9049054013a1b77]*/ diff --git a/Tools/clinic/libclinic/parse_args.py b/Tools/clinic/libclinic/parse_args.py index 653030e7f3aa2d..fc2d9fe987096d 100644 --- a/Tools/clinic/libclinic/parse_args.py +++ b/Tools/clinic/libclinic/parse_args.py @@ -158,13 +158,9 @@ def declare_parser( """) GETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r""" #if defined({getset_basename}_HAS_DOCSTR) - # if !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR {getset_basename}__doc__ - # endif + # define {getset_basename}_DOCSTR {getset_basename}__doc__ #else - # if !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR NULL - # endif + # define {getset_basename}_DOCSTR NULL #endif #if defined({getset_name}_GETSETDEF) # undef {getset_name}_GETSETDEF @@ -174,14 +170,10 @@ def declare_parser( #endif """) SETTERDEF_PROTOTYPE_DEFINE: Final[str] = libclinic.normalize_snippet(r""" - #if defined({getset_basename}_HAS_DOCSTR) - # if !defined({getset_basename}_DOCSTR) - # define {getset_basename}_DOCSTR {getset_basename}__doc__ - # endif + #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 + # define {getset_basename}_DOCSTR NULL #endif #if defined({getset_name}_GETSETDEF) # undef {getset_name}_GETSETDEF