Merge pull request #40 from fgeek/cleanup

Cleanup import orders, continuation and trailing whitespaces

afl_utils/afl_collect.py

@@ -16,18 +16,16 @@
 
 import argparse
 import os
+import queue
 import shutil
 import sys
+import threading
 
 import afl_utils
 from afl_utils import SampleIndex, AflThread
 from afl_utils.AflPrettyPrint import clr, print_ok, print_err, print_warn
 from db_connectors import con_sqlite
 
-import threading
-import queue
-
-
 # afl-collect global settings
 global_crash_subdirs = "crashes"
 global_queue_subdirs = "queue"

afl_utils/afl_multicore.py

@@ -184,7 +184,7 @@ def build_master_cmd(conf_settings, master_index, target_cmd):
     if "master_instances" in conf_settings and conf_settings["master_instances"] > 1:
         # multi-master mode
         master_cmd += ["-M", "%s%03d:%d/%d" % (conf_settings["session"], master_index,
-                                              master_index+1, conf_settings["master_instances"]), "--", target_cmd]
+                                               master_index+1, conf_settings["master_instances"]), "--", target_cmd]
     else:
         # single-master mode
         master_cmd += ["-M", "%s000" % conf_settings["session"], "--", target_cmd]
@@ -379,7 +379,7 @@ def main(argv):
         else:
             if not args.verbose:
                 fuzzer_inst = subprocess.Popen(" ".join(['nohup', cmd]).split(), stdout=subprocess.DEVNULL,
-                                          stderr=subprocess.DEVNULL)
+                                               stderr=subprocess.DEVNULL)
             else:
                 fuzzer_inst = subprocess.Popen(" ".join(['nohup', cmd]).split())
             if is_master:

afl_utils/afl_stats.py

@@ -141,7 +141,7 @@ def parse_stat_file(stat_file, summary=True):
             'afl_version': '',
             'command_line': ''
         }
-        
+
         for l in lines:
             if summary:
                 stats = summary_stats

afl_utils/afl_sync.py

@@ -14,14 +14,14 @@
 limitations under the License.
 """
 
-import afl_utils
-from afl_utils.AflPrettyPrint import clr, print_ok, print_warn, print_err
-
 import argparse
 import os
 import sys
 import subprocess
 
+import afl_utils
+from afl_utils.AflPrettyPrint import clr, print_ok, print_warn, print_err
+
 _rsync_default_options = ['-racz']
 
 
@@ -138,7 +138,7 @@ def main(argv):
     show_info()
 
     parser = argparse.ArgumentParser(description='afl-sync synchronizes fuzzer state directories between different \
-locations. Supported are remote transfers through rsync that may use transport compression.', 
+locations. Supported are remote transfers through rsync that may use transport compression.',
                                      usage='afl-sync [-S SESSION] <cmd> <src_sync_dir> <dst_storage_dir>')
 
     parser.add_argument('cmd',

afl_utils/afl_vcrash.py

@@ -16,16 +16,14 @@
 
 import argparse
 import os
+import queue
 import sys
+import threading
 
 import afl_utils
 from afl_utils import AflThread, afl_collect
 from afl_utils.AflPrettyPrint import *
 
-import threading
-import queue
-
-
 def show_info():
     print(clr.CYA + "afl-vcrash " + clr.BRI + "%s" % afl_utils.__version__ + clr.RST + " by %s" % afl_utils.__author__)
     print("Crash verifier for crash samples collected from afl-fuzz.")