diff options
| author | Simon Warta <[email protected]> | 2017-01-08 13:25:49 +0100 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2017-01-09 19:02:59 +0100 |
| commit | c6e5116ea8f0c891548193934dd89e96fa86460c (patch) | |
| tree | 6a872b82455391750d57e3ee7a629a0cbf85bc97 | |
| parent | 8df51e13900fe5d2fa7563071cd2063c4ef6f4e8 (diff) | |
Rename names that do not follow convention
| -rwxr-xr-x | configure.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.py b/configure.py index de404a07a..1e7eb4e29 100755 --- a/configure.py +++ b/configure.py @@ -693,10 +693,10 @@ class ModuleInfo(object): else: self.warning = None - def intersect_check(typeA, listA, typeB, listB): - intersection = set.intersection(set(listA), set(listB)) + def intersect_check(type_a, list_a, type_b, list_b): + intersection = set.intersection(set(list_a), set(list_b)) if len(intersection) > 0: - logging.error('Headers %s marked both %s and %s' % (' '.join(intersection), typeA, typeB)) + logging.error('Headers %s marked both %s and %s' % (' '.join(intersection), type_a, type_b)) intersect_check('public', self.header_public, 'internal', self.header_internal) intersect_check('public', self.header_public, 'external', self.header_external) @@ -1898,7 +1898,7 @@ def generate_amalgamation(build_config, options): std_include_matcher = re.compile('^#include <([^/\.]+|stddef.h)>$') any_include_matcher = re.compile('#include <(.*)>$') - class Amalgamation_Generator: + class AmalgamationGenerator: def __init__(self, input_list): self.included_already = set() @@ -1955,7 +1955,7 @@ def generate_amalgamation(build_config, options): botan_h = open(header_name, 'w') botan_int_h = open(header_int_name, 'w') - pub_header_amalag = Amalgamation_Generator(build_config.public_headers) + pub_header_amalag = AmalgamationGenerator(build_config.public_headers) amalg_header = """/* * Botan %s Amalgamation @@ -1977,7 +1977,7 @@ def generate_amalgamation(build_config, options): botan_h.write(pub_header_amalag.contents) botan_h.write("\n#endif\n") - internal_headers = Amalgamation_Generator([s for s in build_config.internal_headers]) + internal_headers = AmalgamationGenerator([s for s in build_config.internal_headers]) botan_int_h.write(""" #ifndef BOTAN_AMALGAMATION_INTERNAL_H__ |