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/rrset.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/rrset.py')
| -rw-r--r-- | lib/dnspython/dns/rrset.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dnspython/dns/rrset.py b/lib/dnspython/dns/rrset.py index 7f6c4afed4..21468174d4 100644 --- a/lib/dnspython/dns/rrset.py +++ b/lib/dnspython/dns/rrset.py @@ -36,7 +36,7 @@ class RRset(dns.rdataset.Rdataset): deleting=None): """Create a new RRset.""" - super(RRset, self).__init__(rdclass, rdtype) + super(RRset, self).__init__(rdclass, rdtype, covers) self.name = name self.deleting = deleting @@ -124,9 +124,9 @@ def from_text_list(name, ttl, rdclass, rdtype, text_rdatas): if isinstance(name, (str, unicode)): name = dns.name.from_text(name, None) - 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 = RRset(name, rdclass, rdtype) r.update_ttl(ttl) |