@@ -6902,25 +6902,21 @@ py_ht_errcode_to_name_create(void) {
6902
6902
}
6903
6903
6904
6904
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 );
6907
6905
py_ssl_errcode code = ERR_PACK (p -> library , 0 , p -> reason );
6908
6906
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 );
6910
6907
PyObject * prev = _Py_hashtable_get (table , key ); /* borrowed */
6911
6908
if (prev != NULL ) {
6912
- printf ("old: %s (%d, %d, %ld)\n" , p -> mnemonic , p -> library , p -> reason , code );
6913
6909
assert (PyUnicode_CheckExact (prev ));
6914
6910
if (PyUnicode_EqualToUTF8 (prev , p -> mnemonic )) {
6915
6911
/* sometimes data is duplicated, so we skip it */
6916
6912
continue ;
6917
6913
}
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 ;
6924
6920
}
6925
6921
PyObject * value = PyUnicode_FromString (p -> mnemonic );
6926
6922
if (value == NULL ) {
@@ -6968,12 +6964,12 @@ py_ht_libcode_to_name_create(void) {
6968
6964
/* sometimes data is duplicated, so we skip it */
6969
6965
continue ;
6970
6966
}
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 ;
6977
6973
}
6978
6974
PyObject * value = PyUnicode_FromString (p -> library );
6979
6975
if (value == NULL ) {
0 commit comments