Mercurial > hg > orthanc
changeset 6338:e0b7ee129922 queues-timeout
fix regex
author | Alain Mazy <am@orthanc.team> |
---|---|
date | Fri, 10 Oct 2025 17:52:18 +0200 |
parents | 3abd25edffd5 |
children | 22931817cced |
files | OrthancFramework/Resources/Patches/OpenSSL-ConfigureHeaders.py |
diffstat | 1 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Resources/Patches/OpenSSL-ConfigureHeaders.py Fri Oct 10 16:20:39 2025 +0200 +++ b/OrthancFramework/Resources/Patches/OpenSSL-ConfigureHeaders.py Fri Oct 10 17:52:18 2025 +0200 @@ -92,43 +92,43 @@ def Parse(match): s = '' - for t in re.findall('generate_stack_macros\("(.+?)"\)', match.group(1)): + for t in re.findall(r'generate_stack_macros\("(.+?)"\)', match.group(1)): s += (GENERATE_STACK_MACROS .replace('${nametype}', t) .replace('${realtype}', t) .replace('${plaintype}', t)) - for t in re.findall('generate_const_stack_macros\("(.+?)"\)', match.group(1)): + for t in re.findall(r'generate_const_stack_macros\("(.+?)"\)', match.group(1)): s += (GENERATE_STACK_MACROS .replace('${nametype}', t) .replace('${realtype}', 'const %s' % t) .replace('${plaintype}', t)) - for t in re.findall('generate_stack_string_macros\(\)', match.group(1)): + for t in re.findall(r'generate_stack_string_macros\(\)', match.group(1)): s += (GENERATE_STACK_MACROS .replace('${nametype}', 'OPENSSL_STRING') .replace('${realtype}', 'char') .replace('${plaintype}', 'char')) - for t in re.findall('generate_stack_const_string_macros\(\)', match.group(1)): + for t in re.findall(r'generate_stack_const_string_macros\(\)', match.group(1)): s += (GENERATE_STACK_MACROS .replace('${nametype}', 'OPENSSL_CSTRING') .replace('${realtype}', 'const char') .replace('${plaintype}', 'char')) - for t in re.findall('generate_stack_block_macros\(\)', match.group(1)): + for t in re.findall(r'generate_stack_block_macros\(\)', match.group(1)): s += (GENERATE_STACK_MACROS .replace('${nametype}', 'OPENSSL_BLOCK') .replace('${realtype}', 'void') .replace('${plaintype}', 'void')) - for t in re.findall('generate_lhash_macros\("(.+?)"\)', match.group(1)): + for t in re.findall(r'generate_lhash_macros\("(.+?)"\)', match.group(1)): s += GENERATE_LHASH_MACROS.replace('${type}', t) - for t in re.findall('\$config{rc4_int}', match.group(1)): + for t in re.findall(r'\$config{rc4_int}', match.group(1)): s += 'unsigned int' - for t in re.findall('oids_to_c::process_leaves\(.+?\)', match.group(1), re.MULTILINE | re.DOTALL): + for t in re.findall(r'oids_to_c::process_leaves\(.+?\)', match.group(1), re.MULTILINE | re.DOTALL): if not CURRENT_HEADER in OIDS: raise Exception('Unknown header: %s' % CURRENT_HEADER) @@ -145,18 +145,18 @@ directory = os.path.join(sys.argv[1], base) for source in os.listdir(directory): if source.endswith('.h.in'): - target = re.sub('\.h\.in$', '.h', source) + target = re.sub(r'\.h\.in$', '.h', source) with open(os.path.join(directory, source), 'r') as f: with open(os.path.join(directory, target), 'w') as g: CURRENT_HEADER = source - g.write(re.sub('{-(.*?)-}.*?$', Parse, f.read(), + g.write(re.sub(r'{-(.*?)-}.*?$', Parse, f.read(), flags = re.MULTILINE | re.DOTALL)) with open(os.path.join(sys.argv[1], 'providers/common/der/orthanc_oids_gen.c'), 'w') as f: for (header, content) in OIDS.items(): - f.write('#include "prov/%s"\n' % re.sub('\.h\.in$', '.h', header)) + f.write('#include "prov/%s"\n' % re.sub(r'\.h\.in$', '.h', header)) f.write('\n')