more code cleanup for next release

Author: MelindaShore

examples/checkdanecert.py

@@ -52,7 +52,7 @@ def get_tlsa_rdata_set(replies, requested_usage=None):
     tlsa_rdata_set = []
     for reply in replies:
         for rr in reply['answer']:
-            if rr['type'] == getdns.GETDNS_RRTYPE_TLSA:
+            if rr['type'] == getdns.RRTYPE_TLSA:
                 rdata = rr['rdata']
                 usage = rdata['certificate_usage']
                 selector = rdata['selector']
@@ -74,13 +74,13 @@ def get_tlsa(port, proto, hostname):
     ctx = getdns.Context()
     try:
         results = ctx.general(name=qname,
-                              request_type=getdns.GETDNS_RRTYPE_TLSA,
+                              request_type=getdns.RRTYPE_TLSA,
                               extensions=extensions)
     except getdns.error, e:
         print(str(e))
         sys.exit(1)
 
-    status = results.status'
+    status = results.status
 
     if status == getdns.GETDNS_RESPSTATUS_GOOD:
         return get_tlsa_rdata_set(results.replies_tree, requested_usage=3)

examples/dane_encrypt.py

@@ -33,7 +33,7 @@ def get_first_secure_response(results):
             print 'insecure reply'
 #            return None                      
         answer = replies_tree[0]['answer']
-        record = [ x for x in answer if x['type'] is getdns.GETDNS_RRTYPE_TLSA ]
+        record = [ x for x in answer if x['type'] is getdns.RRTYPE_TLSA ]
         if len(record) == 0:
             print 'no answers of type TLSA'
             return None

examples/get-general.py

@@ -10,7 +10,7 @@
 
 def get_rrtype(qtype):
     try:
-        rrtype = eval("getdns.GETDNS_RRTYPE_%s" % qtype.upper())
+        rrtype = eval("getdns.RRTYPE_%s" % qtype.upper())
     except AttributeError:
         print "Unknown DNS record type: %s" % qtype
         sys.exit(1)
@@ -42,7 +42,7 @@ def print_answer(r):
         for reply in results.replies_tree:
             answers = reply['answer']           # list of 1 here
             for answer in answers:
-                if answer['type'] != getdns.GETDNS_RRTYPE_RRSIG:
+                if answer['type'] != getdns.RRTYPE_RRSIG:
                     pprint.pprint(answer)
     elif status == getdns.GETDNS_RESPSTATUS_NO_NAME:
         print "%s, %s: no such name" % (qname, qtype)

examples/get-mx-ip.py

@@ -33,7 +33,7 @@ def get_ip(ctx, qname):
 
     ctx = getdns.Context()
     try:
-        results = ctx.general(name=qname, request_type=getdns.GETDNS_RRTYPE_MX)
+        results = ctx.general(name=qname, request_type=getdns.RRTYPE_MX)
     except getdns.error, e:
         print(str(e))
         sys.exit(1)
@@ -45,7 +45,7 @@ def get_ip(ctx, qname):
         for reply in results.replies_tree:
             answers = reply['answer']
             for answer in answers:
-                if answer['type'] == getdns.GETDNS_RRTYPE_MX:
+                if answer['type'] == getdns.RRTYPE_MX:
                     iplist = get_ip(ctx, answer['rdata']['exchange'])
                     for ip in iplist:
                         hostlist.append( (answer['rdata']['preference'], \

examples/get-ns-ip.py

@@ -44,7 +44,7 @@ def get_ip(ctx, qname):
 
     ctx = getdns.Context()
     try:
-        results = ctx.general(name=qname, request_type=getdns.GETDNS_RRTYPE_NS)
+        results = ctx.general(name=qname, request_type=getdns.RRTYPE_NS)
     except getdns.error, e:
         print(str(e))
         sys.exit(1)
@@ -55,7 +55,7 @@ def get_ip(ctx, qname):
         for reply in results.replies_tree:
             answers = reply['answer']
             for answer in answers:
-                if answer['type'] == getdns.GETDNS_RRTYPE_NS:
+                if answer['type'] == getdns.RRTYPE_NS:
                     iplist = get_ip(ctx, answer['rdata']['nsdname'])
                     for ip in iplist:
                         hostlist.append( (answer['rdata']['nsdname'], ip) )

examples/get-srv.py

@@ -22,7 +22,7 @@
         for a in reply["answer"]:
             rrname  = a["name"]
             rrtype  = a["type"]
-            if rrtype == getdns.GETDNS_RRTYPE_SRV:
+            if rrtype == getdns.RRTYPE_SRV:
                 rdata   = a["rdata"]
                 prio, weight, port, target = rdata['priority'], rdata['weight'], rdata['port'], rdata['target']
                 print "SRV %s --> %d %d %d %s" % \