summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Halley <halley@nominum.com>2011-07-18 15:05:53 -0700
committerBob Halley <halley@nominum.com>2011-07-18 15:05:53 -0700
commitd601709ae3315dce83115b96d3ff4d353d08a203 (patch)
treea841bbe03afe2b82c8d1cb64fb41a1a891af059d
parentbf436f21b9b6c049f76cd9c5033d8b6fd254da96 (diff)
downloaddnspython-d601709ae3315dce83115b96d3ff4d353d08a203.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 4ea5f02..74ddef0 100644
--- a/dns/rdata.py
+++ b/dns/rdata.py
@@ -412,12 +412,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?