diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-12-09 14:53:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-12-10 03:04:06 +0100 |
| commit | 75ef8f1dd27f4985b3d705e7681a9218ad513c84 (patch) | |
| tree | c28f415ff0e15bc40aa07f191afe0238d45ae598 /lib/dnspython/dns/rdataset.py | |
| parent | 91438920b465ec7455dd1cd700bbe8ec5050b3f9 (diff) | |
| download | samba-75ef8f1dd27f4985b3d705e7681a9218ad513c84.tar.gz samba-75ef8f1dd27f4985b3d705e7681a9218ad513c84.tar.bz2 samba-75ef8f1dd27f4985b3d705e7681a9218ad513c84.zip | |
dnspython: Update to newer upstream snapshot.
Diffstat (limited to 'lib/dnspython/dns/rdataset.py')
| -rw-r--r-- | lib/dnspython/dns/rdataset.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dnspython/dns/rdataset.py b/lib/dnspython/dns/rdataset.py index 0af018bab5..f556d2288b 100644 --- a/lib/dnspython/dns/rdataset.py +++ b/lib/dnspython/dns/rdataset.py @@ -281,9 +281,9 @@ def from_text_list(rdclass, rdtype, ttl, text_rdatas): @rtype: dns.rdataset.Rdataset object """ - if isinstance(rdclass, str): + if isinstance(rdclass, (str, unicode)): rdclass = dns.rdataclass.from_text(rdclass) - if isinstance(rdtype, str): + if isinstance(rdtype, (str, unicode)): rdtype = dns.rdatatype.from_text(rdtype) r = Rdataset(rdclass, rdtype) r.update_ttl(ttl) |