From: Bob Halley <halley@nominum.com>
Date: Mon, 18 Jul 2011 22:05:53 +0000 (-0700)
Subject: doco
X-Git-Tag: v1.10.0-py3~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d601709ae3315dce83115b96d3ff4d353d08a203;p=thirdparty%2Fdnspython.git

doco
---

diff --git a/dns/rdata.py b/dns/rdata.py
index 4ea5f02d..74ddef0b 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?