Fixed up local libs and main.py, waiting on whois lib

This commit is contained in:
benjamyn committed 2018-08-30 02:18:14 +10:00
1 parent bb7f62ca86
commit e7a149781e
10 files changed
+11 -8

No files matched your search

+2 -2
View File
@@ -1,2 +1,2 @@
import files from . import files
import config from . import config
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -1,4 +1,4 @@
import files as f from . import files as f
import json import json
import os import os
+2 -2
View File
@@ -2,7 +2,7 @@ def openFile(path):
try: try:
myFile = open(path) myFile = open(path)
except Exception as e: except Exception as e:
print e print(e)
pass pass
return myFile return myFile
@@ -10,6 +10,6 @@ def closeFile(fileObj):
try: try:
fileObj.close() fileObj.close()
except Exception as e: except Exception as e:
print e print(e)
pass pass
+3 -3
View File
@@ -43,8 +43,8 @@ ipData = {"asn_country_code":"Country", "asn_description":"Owner"}
CountryDict = cc.parseCSV(cc.openCSV(CSVFile)) CountryDict = cc.parseCSV(cc.openCSV(CSVFile))
def domainWhois(inData): def domainWhois(inData):
whoisData = whois.whois(inData).query() whoisData = whois.whois.Whois(inData).query()
return whois.Parser(inData, whoisData[1]).parse() return whois.parser.Parser(inData, whoisData[1]).parse()
def signal_handler(singal, frame): def signal_handler(singal, frame):
quit() quit()
@@ -157,5 +157,5 @@ def checkIfIP(in1):
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
while running == 1: while running == 1:
parseInput(raw_input("Please Enter a domain" + prompt) ) parseInput(input("Please Enter a domain" + prompt) )
print('\n') print('\n')
+3
View File
@@ -0,0 +1,3 @@
dnspython
ipwhois
readline