Implemented DNS lookups based on domain and not test data

main.py

@@ -31,13 +31,20 @@ def printWhois(resultData):
 def parseInput(inData):
     if inData.lower() == "quit":
         quit()
-    #Assume the input is a domain name
     result = domainWhois(inData)
-#    for results in result:
+    print("\nWhos Info")
-#        for item in result[results]:
-#            print('%s: %s' % (results, item))
     printWhois(result)
-#print(result)
+    print("\nDNS Records")
+    recLookup(inData)
+
+def recLookup(inData):
+    for dnsrec in dnsrecords:
+        try:
+            for rdata in dns.resolver.query(inData, dnsrec):
+                print( indent +  "%s:\t%s" % (dnsrec, rdata))
+        except Exception as e:
+            pass
+
 
 signal.signal(signal.SIGINT, signal_handler)
 
@@ -46,17 +53,5 @@ jsonData = config.readConf()
 subdomains = jsonData["subdomains"]
 dnsrecords = jsonData["dnsrecords"]
 
-
-print "root"
-for rdata in dns.resolver.query('yahoo.com', 'A') :
-	print rdata
-for sub in subdomains:
-	print sub
-	try:
-		for rdata in dns.resolver.query(sub + '.yahoo.com', 'CNAME') :
-    			print( rdata.target )
-	except:
-		pass
-
 while running == 1:
     parseInput(raw_input("\nPlease Enter a domain" + prompt) )