@@ -6902,25 +6902,21 @@ py_ht_errcode_to_name_create(void) {
69026902 }
69036903
69046904 for (const py_ssl_error_code * p = error_codes ; p -> mnemonic != NULL ; p ++ ) {
6905- int toshow = p -> library == 41 && (p -> reason == 103 || p -> reason == 106 );
6906- if (toshow ) printf ("%s " , p -> mnemonic );
69076905 py_ssl_errcode code = ERR_PACK (p -> library , 0 , p -> reason );
69086906 const void * key = ssl_errcode_to_ht_key (code );
6909- if (toshow ) printf ("%d, %d, %p, %ld, %ld\n" , p -> library , p -> reason , key , code , (uintptr_t )code );
69106907 PyObject * prev = _Py_hashtable_get (table , key ); /* borrowed */
69116908 if (prev != NULL ) {
6912- printf ("old: %s (%d, %d, %ld)\n" , p -> mnemonic , p -> library , p -> reason , code );
69136909 assert (PyUnicode_CheckExact (prev ));
69146910 if (PyUnicode_EqualToUTF8 (prev , p -> mnemonic )) {
69156911 /* sometimes data is duplicated, so we skip it */
69166912 continue ;
69176913 }
6918- PyErr_Format ( PyExc_SystemError ,
6919- "SSL data contains incompatible entries for "
6920- "(%d, %d; %p, %ld). Old mnemonic is %S but "
6921- "new mnemonic is %s" ,
6922- p -> library , p -> reason , key , code , prev , p -> mnemonic );
6923- goto error ;
6914+ PyErr_WarnFormat ( PyExc_RuntimeWarning , 2 ,
6915+ "SSL data contains incompatible entries for "
6916+ "(%d, %d; %p, %ld). Old mnemonic is %S but "
6917+ "new mnemonic is %s. " ,
6918+ p -> library , p -> reason , key , code , prev , p -> mnemonic );
6919+ continue ;
69246920 }
69256921 PyObject * value = PyUnicode_FromString (p -> mnemonic );
69266922 if (value == NULL ) {
@@ -6968,12 +6964,12 @@ py_ht_libcode_to_name_create(void) {
69686964 /* sometimes data is duplicated, so we skip it */
69696965 continue ;
69706966 }
6971- PyErr_Format ( PyExc_SystemError ,
6972- "SSL data contains incompatible entries for "
6973- "(%p; %d). Old library is %S but new library "
6974- "is %s." ,
6975- key , p -> code , prev , p -> library );
6976- goto error ;
6967+ PyErr_WarnFormat ( PyExc_RuntimeWarning , 2 ,
6968+ "SSL data contains incompatible entries for "
6969+ "(%p; %d). Old library is %S but new library "
6970+ "is %s." ,
6971+ key , p -> code , prev , p -> library );
6972+ continue ;
69776973 }
69786974 PyObject * value = PyUnicode_FromString (p -> library );
69796975 if (value == NULL ) {
0 commit comments