From 0d199267a8cf51121c11e30279e650116d343e34 Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Fri, 30 Mar 2018 02:11:24 +1100 Subject: [PATCH] cleanup --- libs/config.py | 2 +- libs/config.pyc | Bin 583 -> 659 bytes main.py | 6 ------ 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libs/config.py b/libs/config.py index 886d42b..b4ee3ab 100644 --- a/libs/config.py +++ b/libs/config.py @@ -6,7 +6,7 @@ def readConf(fileLoc): try: jsonData = json.loads(f.openFile(os.path.expanduser(fileLoc)).read()) except Exception as e: - print e + print("File not found, you will need to copy the config to your home directory") jasonData = "" return jsonData diff --git a/libs/config.pyc b/libs/config.pyc index df88d28014c9a94887299b3822fd052efb051644..b714dc09690c0672f31bc393ab10f11669c54278 100644 GIT binary patch delta 120 zcmX@kGMSZ)`77R*gt0Zff7~DNl7#V7r8S)qzB5D{Jf;E^J7#RFEi!#$ diff --git a/main.py b/main.py index 7d0a5fd..5cf3934 100755 --- a/main.py +++ b/main.py @@ -29,7 +29,6 @@ CSVFile = jsonData["country_codes"] if platform.system().lower() == "linux": import readline else: - #do windows stuff here colour_attn = "" colour_good = "" colour_pretty = "" @@ -39,7 +38,6 @@ running = 1 prompt = ': ' indent = '~ ' whoisrecs = ["NotFound", "DomainName", "Registrar", "Status", "UpdatedDate", "CreationDate", "ExpirationDate", "RegistrantName", "RegistrantEmail", "EligibilityName", "EligibilityType", "EligibilityID", "RegistrantID", "NameServer"] -#ipData = ["asn_country_code", "asn_description"] ipData = {"asn_country_code":"Country", "asn_description":"Owner"} CountryDict = cc.parseCSV(cc.openCSV(CSVFile)) @@ -49,7 +47,6 @@ def domainWhois(inData): return whois.Parser(inData, whoisData[1]).parse() def signal_handler(singal, frame): - #print('\n') quit() def printWhois(resultData): @@ -77,7 +74,6 @@ def parseInput(inData): if tmpInData == "quit": quit() if checkIfIP(tmpInData): - ##IP lookup code lookupIP(tmpInData) else: lookupDomain(tmpInData) @@ -132,8 +128,6 @@ def lookupIP(inData): ipnet = Net(inData) ipobj = IPASN(ipnet) results = ipobj.lookup() - #for key,value in results.iteritems(): - # print('%s: %s' % (key, value)) for types in ipData: if types == "asn_country_code": print(indent + "%s%s:%s\t%s%s" % (colour_pretty, ipData[types], colour_good, CountryDict[results[types]], colour_default))