Skip to content

Commit 0bcd80d

Browse files
MelindaShoreMelindaShore
committed
Modified example code to use Result object
1 parent 4246c2b commit 0bcd80d

File tree

9 files changed

+49
-34
lines changed

9 files changed

+49
-34
lines changed

‎examples/checkdanecert.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ def get_addresses(hostname):
3636
print(str(e))
3737
sys.exit(1)
3838

39-
status = results['status']
39+
status = results.status
4040

4141
address_list = []
4242
if status == getdns.GETDNS_RESPSTATUS_GOOD:
43-
for addr in results['just_address_answers']:
43+
for addr in results.just_address_answers:
4444
address_list.append((addr['address_type'], addr['address_data']))
4545
else:
4646
print "getdns.address(): failed, return code: %d" % status
@@ -72,13 +72,18 @@ def get_tlsa(port, proto, hostname):
7272
}
7373
qname = "_%d._%s.%s" % (port, proto, hostname)
7474
ctx = getdns.Context()
75-
results = ctx.general(name=qname,
76-
request_type=getdns.GETDNS_RRTYPE_TLSA,
77-
extensions=extensions)
78-
status = results['status']
75+
try:
76+
results = ctx.general(name=qname,
77+
request_type=getdns.GETDNS_RRTYPE_TLSA,
78+
extensions=extensions)
79+
except getdns.error, e:
80+
print(str(e))
81+
sys.exit(1)
82+
83+
status = results.status'
7984

8085
if status == getdns.GETDNS_RESPSTATUS_GOOD:
81-
return get_tlsa_rdata_set(results['replies_tree'], requested_usage=3)
86+
return get_tlsa_rdata_set(results.replies_tree, requested_usage=3)
8287
else:
8388
print "getdns.general(): failed, return code: %d" % status
8489
return None

‎examples/get-general.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def get_rrtype(qtype):
1919

2020

2121
def print_answer(r):
22-
pprint.pprint(r['replies_tree'][0]['answer'])
22+
pprint.pprint(r.replies_tree[0]['answer'])
2323
return
2424

2525

@@ -36,10 +36,10 @@ def print_answer(r):
3636
print(str(e))
3737
sys.exit(1)
3838

39-
status = results['status']
39+
status = results.status
4040

4141
if status == getdns.GETDNS_RESPSTATUS_GOOD:
42-
for reply in results['replies_tree']:
42+
for reply in results.replies_tree:
4343
answers = reply['answer'] # list of 1 here
4444
for answer in answers:
4545
if answer['type'] != getdns.GETDNS_RRTYPE_RRSIG:
@@ -49,4 +49,5 @@ def print_answer(r):
4949
elif status == getdns.GETDNS_RESPSTATUS_ALL_TIMEOUT:
5050
print "%s, %s: query timed out" % (qname, qtype)
5151
else:
52-
print "%s, %s: unknown return code: %d" % results["status"]
52+
print "%s, %s: unknown return code: %d" % results.status
53+

‎examples/get-ip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ def usage():
5656
except getdns.error, e:
5757
print(str(e))
5858
break
59-
status = results['status']
59+
status = results.status
6060
if status == getdns.GETDNS_RESPSTATUS_GOOD:
61-
for addr in results['just_address_answers']:
61+
for addr in results.just_address_answers:
6262
addr_type = addr['address_type']
6363
addr_data = addr['address_data']
6464
if (desired_addr_type == None) or (addr_type == desired_addr_type):

‎examples/get-mx-ip.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ def get_ip(ctx, qname):
1919
print(str(e))
2020
sys.exit(1)
2121

22-
if results['status'] == getdns.GETDNS_RESPSTATUS_GOOD:
23-
for addr in results['just_address_answers']:
22+
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
23+
for addr in results.just_address_answers:
2424
iplist.append(addr['address_data'])
2525
else:
26-
print "getdns.address() returned an error: %d" % results['status']
26+
print "getdns.address() returned an error: %d" % results.status
2727
return iplist
2828

2929

@@ -32,12 +32,17 @@ def get_ip(ctx, qname):
3232
qname = sys.argv[1]
3333

3434
ctx = getdns.Context()
35-
results = ctx.general(name=qname, request_type=getdns.GETDNS_RRTYPE_MX)
36-
status = results['status']
35+
try:
36+
results = ctx.general(name=qname, request_type=getdns.GETDNS_RRTYPE_MX)
37+
except getdns.error, e:
38+
print(str(e))
39+
sys.exit(1)
40+
41+
status = results.status
3742

3843
hostlist = []
3944
if status == getdns.GETDNS_RESPSTATUS_GOOD:
40-
for reply in results['replies_tree']:
45+
for reply in results.replies_tree:
4146
answers = reply['answer']
4247
for answer in answers:
4348
if answer['type'] == getdns.GETDNS_RRTYPE_MX:

‎examples/get-ns-ip.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ def get_ip(ctx, qname):
2727
print(str(e))
2828
sys.exit(1)
2929

30-
if results['status'] == getdns.GETDNS_RESPSTATUS_GOOD:
31-
for addr in results['just_address_answers']:
30+
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
31+
for addr in results.just_address_answers:
3232
iplist.append(addr['address_data'])
3333
else:
3434
print "getdns.address() returned an error: %d" % results['status']
@@ -43,12 +43,16 @@ def get_ip(ctx, qname):
4343
qname = sys.argv[1]
4444

4545
ctx = getdns.Context()
46-
results = ctx.general(name=qname, request_type=getdns.GETDNS_RRTYPE_NS)
47-
status = results['status']
46+
try:
47+
results = ctx.general(name=qname, request_type=getdns.GETDNS_RRTYPE_NS)
48+
except getdns.error, e:
49+
print(str(e))
50+
sys.exit(1)
51+
status = results.status
4852

4953
hostlist = []
5054
if status == getdns.GETDNS_RESPSTATUS_GOOD:
51-
for reply in results['replies_tree']:
55+
for reply in results.replies_tree:
5256
answers = reply['answer']
5357
for answer in answers:
5458
if answer['type'] == getdns.GETDNS_RRTYPE_NS:

‎examples/get-srv.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
print(str(e))
1818
sys.exit(1)
1919

20-
if results["status"] == getdns.GETDNS_RESPSTATUS_GOOD:
21-
for reply in results["replies_tree"]:
20+
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
21+
for reply in results.replies_tree:
2222
for a in reply["answer"]:
2323
rrname = a["name"]
2424
rrtype = a["type"]

‎examples/query-gdns.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
print(str(e))
2828
sys.exit(1)
2929

30-
if results["status"] == getdns.GETDNS_RESPSTATUS_GOOD:
31-
for addr in results["just_address_answers"]:
30+
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
31+
for addr in results.just_address_answers:
3232
print addr["address_data"]
3333
else:
34-
print "getdns.address() returned an error: %d" % results["status"]
34+
print "getdns.address() returned an error: %d" % results.status
3535

‎examples/query-stubmode.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
print(str(e))
1717
sys.exit(1)
1818

19-
if results["status"] == getdns.GETDNS_RESPSTATUS_GOOD:
20-
for addr in results["just_address_answers"]:
19+
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
20+
for addr in results.just_address_answers:
2121
print addr["address_data"]
2222
else:
2323
print "getdns.address() returned an error: %d" % results["status"]

‎examples/simple.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33

44
"""
5-
simply.py
5+
simple.py
66
77
A simple example to query a domain name and print out addresses
88
associated with it.
@@ -21,10 +21,10 @@
2121
print(str(e))
2222
sys.exit(1)
2323

24-
status = results['status']
24+
status = results.status
2525

2626
if status == getdns.GETDNS_RESPSTATUS_GOOD:
27-
for addr in results['just_address_answers']:
27+
for addr in results.just_address_answers:
2828
print addr['address_data']
2929
else:
3030
print "%s: getdns.address() returned error: %d" % (hostname, status)

0 commit comments

Comments
 (0)