fix case of enum names

diff --git a/dns/dnssec.py b/dns/dnssec.py
index ada7d1a3bf1209ac3a148084f35d89ab2c491adc..095fabd45a2366c627a85cea72a93e85c3d6ca08 100644 (file)
--- 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 1342d1eb8fa9816789f0521f287c8ae87346d567..199e8c48638304060342ff09d4c2edc971ec7c24 100644 (file)
--- 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 20e62473e7313f35fbbddb491867ea75ee4e8f62..965228798c82e23e8cd8cdbcabc8b160f6f3f9b2 100644 (file)
--- 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 9401996e824d7845dee81021c0f3874e0410c9fd..ceebdf9c1453d3c734f6f25274f02cefa80d9af4 100644 (file)
--- 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 d5df57fac77c21e32085bfda729930ba02689334..5cf6143c710f25e95ac8149b5e9c4fe6812a5b6d 100644 (file)
--- 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 8b6562e2f7a7b956c93aad1be8e169d058b91856..49fee69503663636c60d3e60fb3636196c46592c 100644 (file)
--- 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 564c3ecb66cd1698a2e363d5f0a4dcbddede858c..41bba693b79934776709b1d526da38d6830798e7 100644 (file)
--- 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 62f51f8ae907e2e6f94facf27bbafa97f6cf0f3f..740752ebe3353d5a12ce67c26dfdb9d3e5a650b7 100644 (file)
--- 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 f9f8c84668c9d1ede95cf9a8f8c0d4a2630087c9..935ebeb2b17032b4edfe76e6a1e1a38ae82140c6 100644 (file)
--- 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 227d74f0f623395ac7f6db98ef066f3cc511b473..a541af22db58ce9b37944dcde783fdcebdf1cc5f 100644 (file)
--- 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 baf54b65ccc672ffd338ca96254685313ce413f2..bd843fa87f6ce797fe0682cc642da02e33896408 100755 (executable)
--- 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: