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 <[email protected]>

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