Merge pull request #105 from linted/python3

Python3 Refactoring (first phase)

Author: codingo

VHostScan/VHostScan.py

@@ -1,12 +1,12 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import sys
 import dns.resolver
 from argparse import ArgumentParser
 from socket import gethostbyaddr
 from pkg_resources import resource_filename
-from .lib.core.virtual_host_scanner import *
-from .lib.helpers.output_helper import *
+from .lib.core.virtual_host_soutput_helpercanner import virtual_host_scanner
+from .lib.helpers.output_helper import output_helper
 from .lib.helpers.file_helper import load_random_user_agents
 from .lib.helpers.wordlist_helper import WordList
 from .lib.core.__version__ import __version__
@@ -17,7 +17,7 @@
 
 
 def print_banner():
-    print("+-+-+-+-+-+-+-+-+-+  v. %s" % __version__)
+    print("+-+-+-+-+-+-+-+-+-+  v. {}".format(__version__))
     print("|V|H|o|s|t|S|c|a|n|  Developed by @codingo_ & @__timk")
     print("+-+-+-+-+-+-+-+-+-+  https://github.com/codingo/VHostScan\n")
 
@@ -88,7 +88,7 @@ def main():
             print("[!] Couldn't find any records (NoAnswer)")
 
     if arguments.verbose:
-        print("[>] Scanning with %s items in wordlist" % len(wordlist))
+        print("[>] Scanning with {} items in wordlist".format(len(wordlist)))
 
     scanner_args = vars(arguments)
     scanner_args.update({
@@ -108,15 +108,18 @@ def main():
 
     if(arguments.output_normal):
         output.write_normal(arguments.output_normal)
-        print("\n[+] Writing normal ouptut to %s" % arguments.output_normal)
+        print("\n[+] Writing normal ouptut to {}".format(
+            arguments.output_normal))
 
     if(arguments.output_json):
         output.output_json(arguments.output_json)
-        print("\n[+] Writing json output to %s" % arguments.output_json)
+        print("\n[+] Writing json output to {}".format(
+            arguments.output_json))
 
     if(arguments.output_grepable):
         output.output_grepable(arguments.output_grepable)
-        print("\n[+] Writing grepable ouptut to %s" % arguments.output_json)
+        print("\n[+] Writing grepable ouptut to {}".format(
+            arguments.output_json))
 
 
 if __name__ == "__main__":

VHostScan/lib/core/virtual_host_scanner.py

@@ -1,13 +1,15 @@
+import hashlib
 import os
 import random
+import time
 
 import requests
-import hashlib
+import urllib3
+
 import pandas as pd
-import time
-from .discovered_host import *
 
-import urllib3
+from .discovered_host import discovered_host
+
 urllib3.disable_warnings()
 requests.packages.urllib3.disable_warnings()
 

VHostScan/lib/helpers/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Copyright (c) 2017 vhostscan developers (https://github.com/codingo/VHostScan)

VHostScan/lib/helpers/file_helper.py

@@ -20,7 +20,8 @@ def check_directory(self):
                 os.stat(directory)
             except:
                 os.mkdir(directory)
-                print("[!] %s didn't exist and has been created." % directory)
+                print("[!] {} didn't exist and has been created.".format(
+                    directory))
 
     def is_json(json_file):
         try:

VHostScan/lib/helpers/output_helper.py

@@ -1,7 +1,6 @@
 import itertools
 import json
 import time
-
 import numpy as np
 
 from fuzzywuzzy import fuzz

VHostScan/lib/helpers/wordlist_helper.py

@@ -1,8 +1,10 @@
 import sys
-from .file_helper import get_combined_word_lists
-from pkg_resources import resource_filename
 from ipaddress import ip_address
 
+from pkg_resources import resource_filename
+
+from .file_helper import get_combined_word_lists
+
 DEFAULT_WORDLIST_FILE = resource_filename(
     'VHostScan', 'wordlists/virtual-host-scanning.txt')