Compare commits

..

No commits in common. "2to3" and "master" have entirely different histories.
2to3 ... master

15 changed files with 103 additions and 109 deletions

View File

@ -1,2 +1,2 @@
from . import files
from . import config
import files
import config

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,4 +1,4 @@
from . import files as f
import files as f
import json
import os

Binary file not shown.

View File

@ -2,7 +2,7 @@ def openFile(path):
try:
myFile = open(path)
except Exception as e:
print(e)
print e
pass
return myFile
@ -10,6 +10,6 @@ def closeFile(fileObj):
try:
fileObj.close()
except Exception as e:
print(e)
print e
pass

Binary file not shown.

View File

@ -43,8 +43,8 @@ ipData = {"asn_country_code":"Country", "asn_description":"Owner"}
CountryDict = cc.parseCSV(cc.openCSV(CSVFile))
def domainWhois(inData):
whoisData = whois.whois.Whois(inData).query()
return whois.parser.Parser(inData, whoisData[1]).parse()
whoisData = whois.whois(inData).query()
return whois.Parser(inData, whoisData[1]).parse()
def signal_handler(singal, frame):
quit()
@ -123,7 +123,6 @@ def lookupDomain(inData):
subLookup(inData, subs)
def lookupIP(inData):
try:
with warnings.catch_warnings():
warnings.filterwarnings("ignore", category=UserWarning)
ipnet = Net(inData)
@ -140,8 +139,6 @@ def lookupIP(inData):
except Exception as E:
reverseName = E
print('\n' + indent + '%sPTR:%s\t\t%s%s' % (colour_pretty, colour_good, reverseName, colour_default))
except:
None
# Taken and modified from DNSpy 1, I am not asahmed it works
def checkIfIP(in1):
@ -160,5 +157,5 @@ def checkIfIP(in1):
signal.signal(signal.SIGINT, signal_handler)
while running == 1:
parseInput(input("Please Enter a domain" + prompt) )
parseInput(raw_input("Please Enter a domain" + prompt) )
print('\n')

View File

@ -1,3 +0,0 @@
dnspython
ipwhois
readline