summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Halley <halley@nominum.com>2011-07-18 15:03:50 -0700
committerBob Halley <halley@nominum.com>2011-07-18 15:03:50 -0700
commitba327515603b57ea010a345ed4bcc71ba399882f (patch)
treee089ee3adb7a4f5c66d4f8c7ee869eef2106b4a9
parent8914cd4936c5a16ccb61a8b3ee8d1362b282e61d (diff)
downloaddnspython-ba327515603b57ea010a345ed4bcc71ba399882f.tar.gz
doco
-rw-r--r--dns/rdata.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/dns/rdata.py b/dns/rdata.py
index fda4b10..350bf79 100644
--- a/dns/rdata.py
+++ b/dns/rdata.py
@@ -413,12 +413,15 @@ def from_text(rdclass, rdtype, tok, origin = None, relativize = True):
Once a class is chosen, its from_text() class method is called
with the parameters to this function.
+ If I{tok} is a string, then a tokenizer is created and the string
+ is used as its input.
+
@param rdclass: The rdata class
@type rdclass: int
@param rdtype: The rdata type
@type rdtype: int
- @param tok: The tokenizer
- @type tok: dns.tokenizer.Tokenizer
+ @param tok: The tokenizer or input text
+ @type tok: dns.tokenizer.Tokenizer or string
@param origin: The origin to use for relative names
@type origin: dns.name.Name
@param relativize: Should names be relativized?