Skip to content

Commit 3245c85

Browse files
MelindaShoreMelindaShore
committed
Finished removing leading GETDNS_ from constants
1 parent 460ae52 commit 3245c85

File tree

12 files changed

+41
-104
lines changed

12 files changed

+41
-104
lines changed

‎examples/async-get-ip.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
def cbk(type, result, userarg, tid):
2727
if type == getdns.CALLBACK_COMPLETE:
2828
status = result.status
29-
if status == getdns.GETDNS_RESPSTATUS_GOOD:
29+
if status == getdns.RESPSTATUS_GOOD:
3030
for addr in result.just_address_answers:
3131
addr_type = addr['address_type']
3232
addr_data = addr['address_data']
3333
print '{0}: {1} {2}'.format(userarg, addr_type, addr_data)
34-
elif status == getdns.GETDNS_RESPSTATUS_NO_SECURE_ANSWERS:
34+
elif status == getdns.RESPSTATUS_NO_SECURE_ANSWERS:
3535
print "%s: No DNSSEC secured responses found" % hostname
3636
else:
3737
print "%s: getdns.address() returned error: %d" % (hostname, status)
@@ -63,7 +63,7 @@ def usage():
6363
if not args:
6464
usage()
6565

66-
extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
66+
extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
6767

6868
ctx = getdns.Context()
6969
tids = []

‎examples/checkdanecert.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def compute_hash(func, string):
2727
def get_addresses(hostname):
2828

2929
extensions = {
30-
"return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE
30+
"return_both_v4_and_v6" : getdns.EXTENSION_TRUE
3131
}
3232
ctx = getdns.Context()
3333
try:
@@ -39,7 +39,7 @@ def get_addresses(hostname):
3939
status = results.status
4040

4141
address_list = []
42-
if status == getdns.GETDNS_RESPSTATUS_GOOD:
42+
if status == getdns.RESPSTATUS_GOOD:
4343
for addr in results.just_address_answers:
4444
address_list.append((addr['address_type'], addr['address_data']))
4545
else:
@@ -68,7 +68,7 @@ def get_tlsa_rdata_set(replies, requested_usage=None):
6868
def get_tlsa(port, proto, hostname):
6969

7070
extensions = {
71-
"dnssec_return_only_secure" : getdns.GETDNS_EXTENSION_TRUE,
71+
"dnssec_return_only_secure" : getdns.EXTENSION_TRUE,
7272
}
7373
qname = "_%d._%s.%s" % (port, proto, hostname)
7474
ctx = getdns.Context()
@@ -82,7 +82,7 @@ def get_tlsa(port, proto, hostname):
8282

8383
status = results.status
8484

85-
if status == getdns.GETDNS_RESPSTATUS_GOOD:
85+
if status == getdns.RESPSTATUS_GOOD:
8686
return get_tlsa_rdata_set(results.replies_tree, requested_usage=3)
8787
else:
8888
print "getdns.general(): failed, return code: %d" % status

‎examples/dane_encrypt.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020
# I commented out the "return None" because this is demo code and you
2121
# should be able to play with it. But, in deployed applications you
22-
# MUST check that dnssec_status is GETDNS_DNSSEC_SECURE
22+
# MUST check that dnssec_status is DNSSEC_SECURE
2323
#
2424

2525
def get_first_secure_response(results):
@@ -29,7 +29,7 @@ def get_first_secure_response(results):
2929
return None
3030
else:
3131
reply = replies_tree[0]
32-
if reply['dnssec_status'] != getdns.GETDNS_DNSSEC_SECURE:
32+
if reply['dnssec_status'] != getdns.DNSSEC_SECURE:
3333
print 'insecure reply'
3434
# return None
3535
answer = replies_tree[0]['answer']
@@ -45,9 +45,9 @@ def main():
4545
if len(sys.argv) == 2:
4646
tls_name = sys.argv[1]
4747
c = getdns.Context()
48-
extensions = { 'dnssec_return_status' : getdns.GETDNS_EXTENSION_TRUE }
48+
extensions = { 'dnssec_return_status' : getdns.EXTENSION_TRUE }
4949
results = c.general(tls_name, request_type=getdns.RRTYPE_TLSA, extensions=extensions)
50-
if results.replies_full['status'] != getdns.GETDNS_RESPSTATUS_GOOD:
50+
if results.replies_full['status'] != getdns.RESPSTATUS_GOOD:
5151
print 'query status is {0}'.format(results.status)
5252
sys.exit(1)
5353
else:

‎examples/get-general.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import getdns, pprint, sys
88

9-
extensions = { "dnssec_return_status" : getdns.GETDNS_EXTENSION_TRUE }
9+
extensions = { "dnssec_return_status" : getdns.EXTENSION_TRUE }
1010

1111
def get_rrtype(qtype):
1212
try:
@@ -38,15 +38,15 @@ def print_answer(r):
3838

3939
status = results.status
4040

41-
if status == getdns.GETDNS_RESPSTATUS_GOOD:
41+
if status == getdns.RESPSTATUS_GOOD:
4242
for reply in results.replies_tree:
4343
answers = reply['answer'] # list of 1 here
4444
for answer in answers:
4545
if answer['type'] != getdns.RRTYPE_RRSIG:
4646
pprint.pprint(answer)
47-
elif status == getdns.GETDNS_RESPSTATUS_NO_NAME:
47+
elif status == getdns.RESPSTATUS_NO_NAME:
4848
print "%s, %s: no such name" % (qname, qtype)
49-
elif status == getdns.GETDNS_RESPSTATUS_ALL_TIMEOUT:
49+
elif status == getdns.RESPSTATUS_ALL_TIMEOUT:
5050
print "%s, %s: query timed out" % (qname, qtype)
5151
else:
5252
print "%s, %s: unknown return code: %d" % results.status

‎examples/get-ip.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ def usage():
3737
if not args:
3838
usage()
3939

40-
extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
40+
extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
4141
desired_addr_type = None
4242

4343
for (opt, optval) in options:
4444
if opt == "-s":
45-
extensions["dnssec_return_only_secure"] = getdns.GETDNS_EXTENSION_TRUE
45+
extensions["dnssec_return_only_secure"] = getdns.EXTENSION_TRUE
4646
elif opt == "-4":
4747
desired_addr_type = "IPv4"
4848
elif opt == "-6":
@@ -57,13 +57,13 @@ def usage():
5757
print(str(e))
5858
break
5959
status = results.status
60-
if status == getdns.GETDNS_RESPSTATUS_GOOD:
60+
if status == getdns.RESPSTATUS_GOOD:
6161
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):
6565
print "%s: %s %s" % (hostname, addr_type, addr_data)
66-
elif status == getdns.GETDNS_RESPSTATUS_NO_SECURE_ANSWERS:
66+
elif status == getdns.RESPSTATUS_NO_SECURE_ANSWERS:
6767
print "%s: No DNSSEC secured responses found" % hostname
6868
else:
6969
print "%s: getdns.address() returned error: %d" % (hostname, status)

‎examples/get-mx-ip.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import getdns, pprint, sys
1010

11-
extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
11+
extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
1212

1313

1414
def get_ip(ctx, qname):
@@ -19,7 +19,7 @@ def get_ip(ctx, qname):
1919
print(str(e))
2020
sys.exit(1)
2121

22-
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
22+
if results.status == getdns.RESPSTATUS_GOOD:
2323
for addr in results.just_address_answers:
2424
iplist.append(addr['address_data'])
2525
else:
@@ -41,7 +41,7 @@ def get_ip(ctx, qname):
4141
status = results.status
4242

4343
hostlist = []
44-
if status == getdns.GETDNS_RESPSTATUS_GOOD:
44+
if status == getdns.RESPSTATUS_GOOD:
4545
for reply in results.replies_tree:
4646
answers = reply['answer']
4747
for answer in answers:
@@ -50,9 +50,9 @@ def get_ip(ctx, qname):
5050
for ip in iplist:
5151
hostlist.append( (answer['rdata']['preference'], \
5252
answer['rdata']['exchange'], ip) )
53-
elif status == getdns.GETDNS_RESPSTATUS_NO_NAME:
53+
elif status == getdns.RESPSTATUS_NO_NAME:
5454
print "%s, %s: no such name" % (qname, qtype)
55-
elif status == getdns.GETDNS_RESPSTATUS_ALL_TIMEOUT:
55+
elif status == getdns.RESPSTATUS_ALL_TIMEOUT:
5656
print "%s, %s: query timed out" % (qname, qtype)
5757
else:
5858
print "%s, %s: unknown return code: %d" % results["status"]

‎examples/get-ns-ip.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import getdns, pprint, sys
1010

11-
extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
11+
extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
1212

1313

1414
def usage():
@@ -27,7 +27,7 @@ def get_ip(ctx, qname):
2727
print(str(e))
2828
sys.exit(1)
2929

30-
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
30+
if results.status == getdns.RESPSTATUS_GOOD:
3131
for addr in results.just_address_answers:
3232
iplist.append(addr['address_data'])
3333
else:
@@ -51,17 +51,17 @@ def get_ip(ctx, qname):
5151
status = results.status
5252

5353
hostlist = []
54-
if status == getdns.GETDNS_RESPSTATUS_GOOD:
54+
if status == getdns.RESPSTATUS_GOOD:
5555
for reply in results.replies_tree:
5656
answers = reply['answer']
5757
for answer in answers:
5858
if answer['type'] == getdns.RRTYPE_NS:
5959
iplist = get_ip(ctx, answer['rdata']['nsdname'])
6060
for ip in iplist:
6161
hostlist.append( (answer['rdata']['nsdname'], ip) )
62-
elif status == getdns.GETDNS_RESPSTATUS_NO_NAME:
62+
elif status == getdns.RESPSTATUS_NO_NAME:
6363
print "%s: no such DNS zone" % qname
64-
elif status == getdns.GETDNS_RESPSTATUS_ALL_TIMEOUT:
64+
elif status == getdns.RESPSTATUS_ALL_TIMEOUT:
6565
print "%s, NS: query timed out" % qname
6666
else:
6767
print "%s, %s: unknown return code: %d" % results["status"]

‎examples/get-srv.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
print(str(e))
1818
sys.exit(1)
1919

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

‎examples/query-gdns.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
hostname = sys.argv[1]
1717

1818
ctx = getdns.Context()
19-
ctx.resolution_type = getdns.GETDNS_RESOLUTION_STUB
19+
ctx.resolution_type = getdns.RESOLUTION_STUB
2020
ctx.upstream_recursive_servers = google_public_dns
2121

22-
extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
22+
extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
2323

2424
try:
2525
results = ctx.address(name=hostname, extensions=extensions)
2626
except getdns.error, e:
2727
print(str(e))
2828
sys.exit(1)
2929

30-
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
30+
if results.status == getdns.RESPSTATUS_GOOD:
3131
for addr in results.just_address_answers:
3232
print addr["address_data"]
3333
else:

‎examples/query-stubmode.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
hostname = sys.argv[1]
66

77
ctx = getdns.Context()
8-
ctx.resolution_type = getdns.GETDNS_RESOLUTION_STUB
8+
ctx.resolution_type = getdns.RESOLUTION_STUB
99

10-
extensions = { "return_both_v4_and_v6" : getdns.GETDNS_EXTENSION_TRUE }
11-
ctx.resolver_type = getdns.GETDNS_RESOLUTION_STUB
10+
extensions = { "return_both_v4_and_v6" : getdns.EXTENSION_TRUE }
11+
ctx.resolver_type = getdns.RESOLUTION_STUB
1212

1313
try:
1414
results = ctx.address(name=hostname, extensions=extensions)
1515
except getdns.error, e:
1616
print(str(e))
1717
sys.exit(1)
1818

19-
if results.status == getdns.GETDNS_RESPSTATUS_GOOD:
19+
if results.status == getdns.RESPSTATUS_GOOD:
2020
for addr in results.just_address_answers:
2121
print addr["address_data"]
2222
else:

0 commit comments

Comments
 (0)