Various changes.

[python_utils.git] / directory_filter.py

diff --git a/directory_filter.py b/directory_filter.py
index 9fa13c2c1169c9895af5de7c4494627cd972d735..5504609ad6d0e92257052370b4132e353c166338 100644 (file)
--- a/directory_filter.py
+++ b/directory_filter.py
@@ -4,18 +4,15 @@ import hashlib
 import os
 from typing import Any, Optional
 
-import predicate
-import file_utils
 
-
-class DirectoryFileFilter(predicate.Predicate):
+class DirectoryFileFilter(object):
     """A predicate that will return False if when a proposed file's
     content to-be-written is identical to the contents of the file;
     skip the write.
     """
-
     def __init__(self, directory: str):
         super().__init__()
+        import file_utils
         if not file_utils.does_directory_exist(directory):
             raise ValueError(directory)
         self.directory = directory
@@ -31,6 +28,7 @@ class DirectoryFileFilter(predicate.Predicate):
                 self._update_file(path, mtime)
 
     def _update_file(self, filename: str, mtime: Optional[float] = None):
+        import file_utils
         assert file_utils.does_file_exist(filename)
         if mtime is None:
             mtime = file_utils.get_file_raw_mtime(filename)
@@ -60,6 +58,7 @@ class DirectoryAllFilesFilter(DirectoryFileFilter):
         print(self.all_md5s)
 
     def _update_file(self, filename: str, mtime: Optional[float] = None):
+        import file_utils
         assert file_utils.does_file_exist(filename)
         if mtime is None:
             mtime = file_utils.get_file_raw_mtime(filename)
@@ -75,4 +74,3 @@ class DirectoryAllFilesFilter(DirectoryFileFilter):
         mem_hash.update(item)
         md5 = mem_hash.hexdigest()
         return md5 not in self.all_md5s
-