Fix miscellaneous syntax errors

Kitware · Nov 29, 2016 · d6133c8 · d6133c8
1 parent a24d0fc
commit d6133c8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/python/smqtk/bin/check_images.py b/python/smqtk/bin/check_images.py
@@ -3,7 +3,6 @@
 valid images.
 """
 import itertools
-import functools
 import logging
 import os
 import sys
@@ -56,12 +55,15 @@ def check_image(image_path):
         return (is_valid_element(dfe, check_image=True), dfe)
 
     with open(args.file_list) as infile:
-        for (is_valid, dfe) in parallel.parallel_map(check_image,
-                                                  itertools.imap(str.strip, infile),
-                                                  name='check-image-validity',
-                                                  use_multiprocessing=True):
-            if is_valid:
-                print('%s,%s' % (dfe._filepath, dfe.uuid()))
+        checked_images = parallel.parallel_map(check_image,
+                                               itertools.imap(str.strip, infile),
+                                               name='check-image-validity',
+                                               use_multiprocessing=True)
+        valid_images = itertools.imap(lambda x: x[1],
+                                      itertools.ifilter(lambda x: x[0], checked_images))
+
+        for dfe in valid_images:
+            print('%s,%s' % (dfe._filepath, dfe.uuid()))
 
 
 if __name__ == '__main__':

diff --git a/python/smqtk/bin/compute_many_descriptors.py b/python/smqtk/bin/compute_many_descriptors.py
@@ -6,13 +6,9 @@
 """
 import collections
 import csv
-import functools
-import io
 import logging
 import os
 
-import PIL.Image
-
 from smqtk.algorithms import get_descriptor_generator_impls
 from smqtk.compute_functions import compute_many_descriptors
 from smqtk.representation import (
@@ -97,7 +93,6 @@ def run_file_list(c, filelist_filepath, checkpoint_filepath, batch_size=None,
     generator = plugin.from_plugin_config(c['descriptor_generator'],
                                           get_descriptor_generator_impls())
 
-
     def iter_valid_elements():
         def is_valid(file_path):
             dfe = DataFileElement(file_path)

diff --git a/python/smqtk/utils/image_utils.py b/python/smqtk/utils/image_utils.py
@@ -2,8 +2,7 @@
 import logging
 import PIL.Image
 
-from smqtk.representation.data_element.file_element import (DataElement,
-                                                            DataFileElement)
+from smqtk.representation.data_element.file_element import DataElement
 
 
 def is_loadable_image(data_element):