X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=file_utils.py;h=d5451244bb71bf8ce7fc4e0d03c1162b01e0f3e8;hb=7d7a3ce0abb26766e82c6dfed8a196baa63b736a;hp=7cc8b632ac692d47a6f272403100c6806dc19136;hpb=dab5654d392f69fb00bed49cf8ffb80f37642ea5;p=python_utils.git diff --git a/file_utils.py b/file_utils.py index 7cc8b63..d545124 100644 --- a/file_utils.py +++ b/file_utils.py @@ -12,9 +12,6 @@ from typing import Optional import glob from os.path import isfile, join, exists -import datetime_utils - - logger = logging.getLogger(__name__) @@ -200,13 +197,14 @@ def get_file_mtime_timedelta(filename: str) -> Optional[datetime.timedelta]: def describe_file_timestamp( filename: str, extractor, *, brief=False ) -> Optional[str]: + from datetime_utils import describe_duration, describe_duration_briefly age = get_file_timestamp_age_seconds(filename, extractor) if age is None: return None if brief: - return datetime_utils.describe_duration_briefly(age) + return describe_duration_briefly(age) else: - return datetime_utils.describe_duration(age) + return describe_duration(age) def describe_file_atime(filename: str, *, brief=False) -> Optional[str]: @@ -244,5 +242,5 @@ def get_files_recursive(directory: str): for filename in get_files(directory): yield filename for subdir in get_directories(directory): - for filename in get_files_recursive(subdir): - yield filename + for file_or_directory in get_files_recursive(subdir): + yield file_or_directory