diff options
-rw-r--r-- | dns/dnssec.py | 4 | ||||
-rw-r--r-- | dns/edns.py | 4 | ||||
-rw-r--r-- | dns/flags.py | 8 | ||||
-rw-r--r-- | dns/message.py | 4 | ||||
-rw-r--r-- | dns/opcode.py | 4 | ||||
-rw-r--r-- | dns/rcode.py | 4 | ||||
-rw-r--r-- | dns/rdataclass.py | 4 | ||||
-rw-r--r-- | dns/rdatatype.py | 4 | ||||
-rw-r--r-- | dns/rdtypes/dnskeybase.py | 4 | ||||
-rw-r--r-- | dns/update.py | 4 | ||||
-rwxr-xr-x | util/constants-tool | 7 |
11 files changed, 27 insertions, 24 deletions
diff --git a/dns/dnssec.py b/dns/dnssec.py index ada7d1a..095fabd 100644 --- a/dns/dnssec.py +++ b/dns/dnssec.py @@ -582,7 +582,7 @@ else: validate_rrsig = _validate_rrsig # type: ignore _have_pyca = True -### BEGIN generated algorithm constants +### BEGIN generated Algorithm constants RSAMD5 = Algorithm.RSAMD5 DH = Algorithm.DH @@ -602,4 +602,4 @@ INDIRECT = Algorithm.INDIRECT PRIVATEDNS = Algorithm.PRIVATEDNS PRIVATEOID = Algorithm.PRIVATEOID -### END generated algorithm constants +### END generated Algorithm constants diff --git a/dns/edns.py b/dns/edns.py index 1342d1e..199e8c4 100644 --- a/dns/edns.py +++ b/dns/edns.py @@ -352,7 +352,7 @@ def register_type(implementation, otype): _type_to_class[otype] = implementation -### BEGIN generated optiontype constants +### BEGIN generated OptionType constants NSID = OptionType.NSID DAU = OptionType.DAU @@ -365,4 +365,4 @@ KEEPALIVE = OptionType.KEEPALIVE PADDING = OptionType.PADDING CHAIN = OptionType.CHAIN -### END generated optiontype constants +### END generated OptionType constants diff --git a/dns/flags.py b/dns/flags.py index 20e6247..9652287 100644 --- a/dns/flags.py +++ b/dns/flags.py @@ -100,7 +100,7 @@ def edns_to_text(flags): return _to_text(flags, EDNSFlag) -### BEGIN generated flag constants +### BEGIN generated Flag constants QR = Flag.QR AA = Flag.AA @@ -110,10 +110,10 @@ RA = Flag.RA AD = Flag.AD CD = Flag.CD -### END generated flag constants +### END generated Flag constants -### BEGIN generated ednsflag constants +### BEGIN generated EDNSFlag constants DO = EDNSFlag.DO -### END generated ednsflag constants +### END generated EDNSFlag constants diff --git a/dns/message.py b/dns/message.py index 9401996..ceebdf9 100644 --- a/dns/message.py +++ b/dns/message.py @@ -1465,11 +1465,11 @@ def make_response(query, recursion_available=False, our_payload=8192, response.request_mac = query.mac return response -### BEGIN generated messagesection constants +### BEGIN generated MessageSection constants QUESTION = MessageSection.QUESTION ANSWER = MessageSection.ANSWER AUTHORITY = MessageSection.AUTHORITY ADDITIONAL = MessageSection.ADDITIONAL -### END generated messagesection constants +### END generated MessageSection constants diff --git a/dns/opcode.py b/dns/opcode.py index d5df57f..5cf6143 100644 --- a/dns/opcode.py +++ b/dns/opcode.py @@ -104,7 +104,7 @@ def is_update(flags): return from_flags(flags) == Opcode.UPDATE -### BEGIN generated opcode constants +### BEGIN generated Opcode constants QUERY = Opcode.QUERY IQUERY = Opcode.IQUERY @@ -112,4 +112,4 @@ STATUS = Opcode.STATUS NOTIFY = Opcode.NOTIFY UPDATE = Opcode.UPDATE -### END generated opcode constants +### END generated Opcode constants diff --git a/dns/rcode.py b/dns/rcode.py index 8b6562e..49fee69 100644 --- a/dns/rcode.py +++ b/dns/rcode.py @@ -137,7 +137,7 @@ def to_text(value, tsig=False): return 'BADSIG' return Rcode.to_text(value) -### BEGIN generated rcode constants +### BEGIN generated Rcode constants NOERROR = Rcode.NOERROR FORMERR = Rcode.FORMERR @@ -161,4 +161,4 @@ BADALG = Rcode.BADALG BADTRUNC = Rcode.BADTRUNC BADCOOKIE = Rcode.BADCOOKIE -### END generated rcode constants +### END generated Rcode constants diff --git a/dns/rdataclass.py b/dns/rdataclass.py index 564c3ec..41bba69 100644 --- a/dns/rdataclass.py +++ b/dns/rdataclass.py @@ -100,7 +100,7 @@ def is_metaclass(rdclass): return True return False -### BEGIN generated rdataclass constants +### BEGIN generated RdataClass constants RESERVED0 = RdataClass.RESERVED0 IN = RdataClass.IN @@ -112,4 +112,4 @@ HESIOD = RdataClass.HESIOD NONE = RdataClass.NONE ANY = RdataClass.ANY -### END generated rdataclass constants +### END generated RdataClass constants diff --git a/dns/rdatatype.py b/dns/rdatatype.py index 62f51f8..740752e 100644 --- a/dns/rdatatype.py +++ b/dns/rdatatype.py @@ -218,7 +218,7 @@ def register_type(rdtype, rdtype_text, is_singleton=False): if is_singleton: _singletons.add(rdtype) -### BEGIN generated rdatatype constants +### BEGIN generated RdataType constants TYPE0 = RdataType.TYPE0 NONE = RdataType.NONE @@ -294,4 +294,4 @@ AMTRELAY = RdataType.AMTRELAY TA = RdataType.TA DLV = RdataType.DLV -### END generated rdatatype constants +### END generated RdataType constants diff --git a/dns/rdtypes/dnskeybase.py b/dns/rdtypes/dnskeybase.py index f9f8c84..935ebeb 100644 --- a/dns/rdtypes/dnskeybase.py +++ b/dns/rdtypes/dnskeybase.py @@ -71,10 +71,10 @@ class DNSKEYBase(dns.rdata.Rdata): return cls(rdclass, rdtype, header[0], header[1], header[2], key) -### BEGIN generated flag constants +### BEGIN generated Flag constants SEP = Flag.SEP REVOKE = Flag.REVOKE ZONE = Flag.ZONE -### END generated flag constants +### END generated Flag constants diff --git a/dns/update.py b/dns/update.py index 227d74f..a541af2 100644 --- a/dns/update.py +++ b/dns/update.py @@ -309,11 +309,11 @@ class UpdateMessage(dns.message.Message): # backwards compatibility Update = UpdateMessage -### BEGIN generated updatesection constants +### BEGIN generated UpdateSection constants ZONE = UpdateSection.ZONE PREREQ = UpdateSection.PREREQ UPDATE = UpdateSection.UPDATE ADDITIONAL = UpdateSection.ADDITIONAL -### END generated updatesection constants +### END generated UpdateSection constants diff --git a/util/constants-tool b/util/constants-tool index baf54b6..bd843fa 100755 --- a/util/constants-tool +++ b/util/constants-tool @@ -25,6 +25,7 @@ def generate(): dot = enum_name.rindex('.') module_name = enum_name[:dot] type_name = enum_name[dot + 1:] + lname = type_name.lower() mod = import_module(module_name) enum = getattr(mod, type_name) filename = module_name.replace('.', '/') + '.py' @@ -39,7 +40,8 @@ def generate(): l = lines[i].rstrip() i += 1 if l.startswith(f'### BEGIN generated {type_name} ' + - 'constants'): + 'constants') or \ + l.startswith(f'### BEGIN generated {lname} constants'): found = True break else: @@ -50,7 +52,8 @@ def generate(): l = lines[i].rstrip() i += 1 if l.startswith(f'### END generated {type_name} ' + - 'constants'): + 'constants') or \ + l.startswith(f'### END generated {lname} constants'): found = True break if not found: |