Skip to content

Support registering new types with classes. #1167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rthalley merged 3 commits into from
Nov 29, 2024
+21 −5
Merged

Support registering new types with classes. #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1b2fa2
Support registering new types with classes.
bwelling Nov 27, 2024
42c9a69
Attempt to make mypy happy.
bwelling Nov 27, 2024
dd07cf2
Merge branch 'rthalley:main' into register_type_by_class
bwelling Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions dns/rdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,8 +891,8 @@ def register_type(
) -> None:
"""Dynamically register a module to handle an rdatatype.

*implementation*, a module implementing the type in the usual dnspython
way.
*implementation*, a subclass of ``dns.rdata.Rdata`` implementing the type,
or a module containing such a class named by its text form.

*rdtype*, an ``int``, the rdatatype to register.

Expand All @@ -909,7 +909,9 @@ def register_type(
existing_cls = get_rdata_class(rdclass, rdtype)
if existing_cls != GenericRdata or dns.rdatatype.is_metatype(rdtype):
raise RdatatypeExists(rdclass=rdclass, rdtype=rdtype)
_rdata_classes[(rdclass, rdtype)] = getattr(
implementation, rdtype_text.replace("-", "_")
)
if isinstance(implementation, type) and issubclass(implementation, Rdata):
impclass = implementation
else:
impclass = getattr(implementation, rdtype_text.replace("-", "_"))
_rdata_classes[(rdclass, rdtype)] = impclass
dns.rdatatype.register_type(rdtype, rdtype_text, is_singleton)
14 changes: 14 additions & 0 deletions tests/test_rdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,20 @@ def test_module_registration(self):
self.assertEqual(dns.rdatatype.from_text("ttxt"), TTXT)
self.assertEqual(dns.rdatatype.RdataType.make("ttxt"), TTXT)

def test_class_registration(self):
CTXT = 64003
class CTXTImp(dns.rdtypes.txtbase.TXTBase):
"""Test TXT-like record"""

dns.rdata.register_type(CTXTImp, CTXT, "CTXT")
rdata = dns.rdata.from_text(dns.rdataclass.IN, CTXT, "hello world")
self.assertEqual(rdata.strings, (b"hello", b"world"))
self.assertEqual(dns.rdatatype.to_text(CTXT), "CTXT")
self.assertEqual(dns.rdatatype.from_text("CTXT"), CTXT)
self.assertEqual(dns.rdatatype.RdataType.make("CTXT"), CTXT)
self.assertEqual(dns.rdatatype.from_text("ctxt"), CTXT)
self.assertEqual(dns.rdatatype.RdataType.make("ctxt"), CTXT)

def test_module_reregistration(self):
def bad():
TTXTTWO = dns.rdatatype.TXT
Expand Down