Apply isort

This patch applies effects of the following patch that adds `isort` to CI.

The patch-ordering is because adding to CI first would cause CI to fail
on finding files need to be re-formatted by `pre-commit`.  This also
separates manual changes from automated changes.

Disclaimer:
Participation by NIST in the creation of the documentation of mentioned
software is not intended to imply a recommendation or endorsement by the
National Institute of Standards and Technology, nor is it intended to
imply that any specific software is necessarily the best available for
the purpose.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>

Author: ajnelson-nist

demos/demo_fiwalk_diskimage.py

@@ -6,10 +6,12 @@
 if the required buffer size exceeds available RAM!
 """
 
-import sys
 import io
+import sys
+
 from dfxml import fiwalk
 
+
 def writeDfxml(imageFile: str, outFile: str) -> None:
     """Generate filesystem metadata for disk image and and write resulting
     dfxml to file"""

demos/demo_mac_timeline.py

@@ -7,7 +7,6 @@
 sys.path.append( os.path.join(os.path.dirname(__file__), ".."))
 import dfxml
 
-
 timeline = []
 
 def process(fi):

demos/demo_mac_timeline_iter.py

@@ -22,6 +22,7 @@
 sys.path.append( os.path.join(os.path.dirname(__file__), ".."))
 import dfxml
 
+
 def main():
     if len(sys.argv) < 2:
         print("Usage: {} <filename.xml>".format(sys.argv[0]))

demos/demo_piecewise.py

@@ -9,10 +9,11 @@
 import sys
 
 sys.path.append( os.path.join(os.path.dirname(__file__), ".."))
-import dfxml
-
+import collections
+import math
+import sys
 
-import math,sys,collections
+import dfxml
 
 
 class SectorCorrelator:

demos/demo_plot_times.py

@@ -1,14 +1,13 @@
 #!/usr/bin/python                                                                                                     
-import fiwalk
-import time
-
 import os
 import sys
+import time
+
+import fiwalk
 
 sys.path.append( os.path.join(os.path.dirname(__file__), ".."))
 import dfxml
 
-
 if __name__=="__main__":
     import sys
     from optparse import OptionParser

demos/demo_readtimes.py

@@ -1,15 +1,15 @@
 #!/usr/bin/python
 """Reads an fiwalk XML file and reports how many of the files are still in the image..."""
 
-import sys,os
-
 import os
 import sys
 
 sys.path.append( os.path.join(os.path.dirname(__file__), ".."))
+import time
+
 import dfxml
 import dfxml.fiwalk as fiwalk
-import time
+
 
 def calc_jumps(fis,title):
     print(title)
@@ -39,7 +39,7 @@ def calc_jumps(fis,title):
 if __name__=="__main__":
     import sys
     from optparse import OptionParser
-    from subprocess import Popen,PIPE
+    from subprocess import PIPE, Popen
     global options
 
     parser = OptionParser()

demos/demo_registry_timeline.py

@@ -5,7 +5,6 @@
 sys.path.append( os.path.join(os.path.dirname(__file__), ".."))
 import dfxml
 
-
 timeline = []
 
 def process(co):

demos/demo_sizes.py

@@ -4,10 +4,10 @@
 # Demo program that shows how to calculate the average size of file objects in a DFXML file
 #
 
+import collections
 import math
-import sys
 import os
-import collections
+import sys
 
 sys.path.append( os.path.join(os.path.dirname(__file__), ".."))
 import dfxml

demos/demo_spark.py

@@ -4,18 +4,19 @@
 # This program runs spark if it is not already running
 
 
-import sys
 import os
+import sys
 
 sys.path.append("../python")
 from dfxml_writer import DFXMLWriter
 
+
 def spark_demo():
     """A small spark program. Must be run under spark"""
-    from pyspark import SparkConf
-    from pyspark import SparkContext
     import operator
 
+    from pyspark import SparkConf, SparkContext
+
     conf = SparkConf()
     sc   = SparkContext(conf=conf)
     m    = 1000000

demos/spark/demo_spark.py

@@ -4,18 +4,19 @@
 # This program runs Spark if it is not already running
 
 
-import sys
 import os
+import sys
 
 sys.path.append("../python")
 from dfxml_writer import DFXMLWriter
 
+
 def spark_demo():
     """A small Spark program. Must be run under Spark"""
-    from pyspark import SparkConf
-    from pyspark import SparkContext
     import operator
 
+    from pyspark import SparkConf, SparkContext
+
     conf = SparkConf()
     sc   = SparkContext(conf=conf)
     m    = 1000000

demos/vmstats/vmstats.py

@@ -6,9 +6,10 @@
 import os
 import os.path
 import sys
+import time
 import xml.etree.ElementTree as ET
+
 import psutil
-import time
 
 sys.path.append( os.path.join(os.path.dirname(__file__), "../../python") )
 
@@ -70,8 +71,8 @@ def write_process_dfxml_to_file(fname,prettyprint=False):
             f.write("\n")
 
 if __name__=="__main__":
-    from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
     import time
+    from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
     parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter)
     parser.add_argument("fname",help="filename")
     parser.add_argument("--repeat",help="Number of times to repeat",type=int,default=1)

demos/vmstats/vmstats_decode.py

@@ -2,20 +2,22 @@
 #
 # plot vmstats output
 
+import datetime
+import json
 import os
 import os.path
+import shutil
+import statistics
 import sys
+import time
 import xml.etree.ElementTree as ET
+
 import psutil
-import time
-import json
-import statistics
-import shutil
-import datetime
 
 sys.path.append( os.path.join(os.path.dirname(__file__), "../python") )
 import dfxml
 
+
 def get_dfxml(fname):
     # Given a file, return dfxml objects
     with open(fname,"r") as f:
@@ -70,9 +72,10 @@ def html_filename(root):
 
 TEMPLATE_FILE = "vmstats_decode.html"
 def html_generate(root, *, prev_fname, next_fname):
-    import jinja2 
     import os.path
 
+    import jinja2
+
     stats   = get_stats(root)
     ps_list = list( get_processes(root) )
 
@@ -91,8 +94,8 @@ def html_generate(root, *, prev_fname, next_fname):
 
 
 if __name__=="__main__":
-    from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
     import time
+    from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
     parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter)
     parser.add_argument("fname",nargs="+", help="filename")
     parser.add_argument("--ps", help="Show the processes", action='store_true')
@@ -170,6 +173,7 @@ def myconverter(o):
 
     if args.plot:
         import datetime
+
         import matplotlib.pyplot as plt
         t0 = stats[0]['start_time']
         when = [ (st['start_time']-t0).total_seconds() for st in stats]

dfxml/__init__.py

@@ -45,15 +45,14 @@
 
 __version__ = "1.0.2"
 
-import sys
-import re
-from sys import stderr
-from subprocess import Popen,PIPE
 import base64
+import datetime
 import hashlib
 import os
-
-import datetime
+import re
+import sys
+from subprocess import PIPE, Popen
+from sys import stderr
 
 #slg: removed this, because the dfxml module shouldn't define a logger.
 #I don't even think that objects should define a logger...
@@ -90,7 +89,9 @@ def timestamp2iso8601(ts):
     import time
     return time.strftime("%FT%TZ",time.gmtime(ts))
 
-from datetime import tzinfo,timedelta
+from datetime import timedelta, tzinfo
+
+
 class GMTMIN(tzinfo):
     def __init__(self,minoffset):         # DST starts last Sunday in March
         self.minoffset = minoffset
@@ -417,6 +418,7 @@ def iso8601(self):
 
     def timestamp(self):
         import time
+
         # Do we have a cached representation?
         try:
             return self.timestamp_
@@ -434,6 +436,7 @@ def timestamp(self):
 
     def datetime(self):
         import datetime
+
         # return the datetime from parsing either iso8601 or from parsing timestamp
         try:
             self.datetime_ = self.ts2datetime(self.timestamp_)

dfxml/bin/Extractor.py

@@ -15,11 +15,11 @@
 
 __version__ = "0.5.2"
 
+import copy
+import hashlib
+import logging
 import os
 import sys
-import logging
-import hashlib
-import copy
 import traceback
 
 _logger = logging.getLogger(os.path.basename(__file__))

dfxml/bin/allocation_counter.py

@@ -22,14 +22,14 @@
 # * Tabular output in HTML
 # * Tabular output in LaTeX
 
-import dfxml.objects as Objects
-import dfxml.bin.make_differential_dfxml
-
 import collections
 import logging
+import os
 import sys
 import xml.etree.ElementTree as ET
-import os
+
+import dfxml.bin.make_differential_dfxml
+import dfxml.objects as Objects
 
 _logger = logging.getLogger(os.path.basename(__file__))
 

dfxml/bin/break_out_diffs_by_anno.py

@@ -22,9 +22,11 @@
 
 __version__ = "0.1.0"
 
-import dfxml.objects as Objects
-import sys
 import collections
+import sys
+
+import dfxml.objects as Objects
+
 
 def main():
     #Key: (annotation, histogram)

dfxml/bin/cat_fileobjects.py

@@ -19,11 +19,12 @@
 
 __version__ = "0.3.1"
 
+import logging
+import os
 import sys
 import xml.etree.ElementTree as ET
+
 import dfxml
-import logging
-import os
 
 _logger = logging.getLogger(os.path.basename(__file__))
 

dfxml/bin/cat_partitions.py

@@ -29,12 +29,13 @@
 
 __version__ = "0.2.2"
 
-import dfxml.objects as Objects
 import logging
 import os
 import sys
 import xml.etree.ElementTree as ET
 
+import dfxml.objects as Objects
+
 _logger = logging.getLogger(os.path.basename(__file__))
 
 def main():

dfxml/bin/corpus_sync.py

@@ -2,9 +2,11 @@
 #
 # sync corpus based on DFXML files
 
+from collections import defaultdict
+
 import dfxml
 import dfxml.fiwalk as fiwalk
-from collections import defaultdict
+
 
 class CorpusDB:
     def __init__(self):
@@ -28,8 +30,8 @@ def __delitem__(self,fi):
 
 
 if __name__=="__main__":
-    from optparse import OptionParser
     from copy import deepcopy
+    from optparse import OptionParser
 
     parser = OptionParser()
     (options,args) = parser.parse_args()

dfxml/bin/dedup.py

@@ -2,7 +2,11 @@
 #
 # dedup  - detect and optionally remove duplicates based on a DFXML file
 
-import os,dfxml,xml
+import os
+import xml
+
+import dfxml
+
 
 class dedup:
     def __init__(self):