From e7c090a0b1831525a098e9d61cf76111050eee40 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Mon, 3 Aug 2020 06:41:31 -0700 Subject: [PATCH] remove globals() enum updating --- dns/dnssec.py | 3 --- dns/edns.py | 1 - dns/flags.py | 5 ----- dns/message.py | 1 - dns/opcode.py | 2 -- dns/rcode.py | 1 - dns/rdataclass.py | 1 - dns/rdatatype.py | 2 -- dns/rdtypes/dnskeybase.py | 2 -- dns/update.py | 2 -- 10 files changed, 20 deletions(-) diff --git a/dns/dnssec.py b/dns/dnssec.py index 79752aae..ada7d1a3 100644 --- a/dns/dnssec.py +++ b/dns/dnssec.py @@ -64,9 +64,6 @@ class Algorithm(dns.enum.IntEnum): return 255 -globals().update(Algorithm.__members__) - - def algorithm_from_text(text): """Convert text into a DNSSEC algorithm value. diff --git a/dns/edns.py b/dns/edns.py index 75ecdf18..1342d1eb 100644 --- a/dns/edns.py +++ b/dns/edns.py @@ -50,7 +50,6 @@ class OptionType(dns.enum.IntEnum): def _maximum(cls): return 65535 -globals().update(OptionType.__members__) class Option: diff --git a/dns/flags.py b/dns/flags.py index a53197c7..20e62473 100644 --- a/dns/flags.py +++ b/dns/flags.py @@ -37,8 +37,6 @@ class Flag(enum.IntFlag): #: Checking Disabled CD = 0x0010 -globals().update(Flag.__members__) - # EDNS flags @@ -47,9 +45,6 @@ class EDNSFlag(enum.IntFlag): DO = 0x8000 -globals().update(EDNSFlag.__members__) - - def _from_text(text, enum_class): flags = 0 tokens = text.split() diff --git a/dns/message.py b/dns/message.py index 1a5787f7..9401996e 100644 --- a/dns/message.py +++ b/dns/message.py @@ -107,7 +107,6 @@ class MessageSection(dns.enum.IntEnum): def _maximum(cls): return 3 -globals().update(MessageSection.__members__) DEFAULT_EDNS_PAYLOAD = 1232 MAX_CHAIN = 16 diff --git a/dns/opcode.py b/dns/opcode.py index 32f209fa..d5df57fa 100644 --- a/dns/opcode.py +++ b/dns/opcode.py @@ -40,8 +40,6 @@ class Opcode(dns.enum.IntEnum): def _unknown_exception_class(cls): return UnknownOpcode -globals().update(Opcode.__members__) - class UnknownOpcode(dns.exception.DNSException): """An DNS opcode is unknown.""" diff --git a/dns/rcode.py b/dns/rcode.py index 6e33045b..8b6562e2 100644 --- a/dns/rcode.py +++ b/dns/rcode.py @@ -72,7 +72,6 @@ class Rcode(dns.enum.IntEnum): def _unknown_exception_class(cls): return UnknownRcode -globals().update(Rcode.__members__) class UnknownRcode(dns.exception.DNSException): """A DNS rcode is unknown.""" diff --git a/dns/rdataclass.py b/dns/rdataclass.py index af0bd997..564c3ecb 100644 --- a/dns/rdataclass.py +++ b/dns/rdataclass.py @@ -48,7 +48,6 @@ class RdataClass(dns.enum.IntEnum): def _unknown_exception_class(cls): return UnknownRdataclass -globals().update(RdataClass.__members__) _metaclasses = {RdataClass.NONE, RdataClass.ANY} diff --git a/dns/rdatatype.py b/dns/rdatatype.py index 1abc59c9..62f51f8a 100644 --- a/dns/rdatatype.py +++ b/dns/rdatatype.py @@ -115,8 +115,6 @@ class RdataType(dns.enum.IntEnum): _registered_by_text = {} _registered_by_value = {} -globals().update(RdataType.__members__) - _metatypes = {RdataType.OPT} _singletons = {RdataType.SOA, RdataType.NXT, RdataType.DNAME, diff --git a/dns/rdtypes/dnskeybase.py b/dns/rdtypes/dnskeybase.py index 1fac4bdc..f9f8c846 100644 --- a/dns/rdtypes/dnskeybase.py +++ b/dns/rdtypes/dnskeybase.py @@ -31,8 +31,6 @@ class Flag(enum.IntFlag): REVOKE = 0x0080 ZONE = 0x0100 -globals().update(Flag.__members__) - class DNSKEYBase(dns.rdata.Rdata): diff --git a/dns/update.py b/dns/update.py index b4cb755a..227d74f0 100644 --- a/dns/update.py +++ b/dns/update.py @@ -38,8 +38,6 @@ class UpdateSection(dns.enum.IntEnum): def _maximum(cls): return 3 -globals().update(UpdateSection.__members__) - class UpdateMessage(dns.message.Message): -- 2.47.3