projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove missing import.
[python_utils.git]
/
file_utils.py
diff --git
a/file_utils.py
b/file_utils.py
index e40a9f5fdc2de049cb96b8f63a16541df732ffb7..5d9a0be3b272bbc51eebf7894baac7a25fe11179 100644
(file)
--- a/
file_utils.py
+++ b/
file_utils.py
@@
-2,7
+2,6
@@
"""Utilities for working with files."""
"""Utilities for working with files."""
-from dataclasses import dataclass
import datetime
import errno
import hashlib
import datetime
import errno
import hashlib
@@
-249,9
+248,7
@@
def is_same_file(file1: str, file2: str) -> bool:
def get_file_raw_timestamps(filename: str) -> Optional[os.stat_result]:
def get_file_raw_timestamps(filename: str) -> Optional[os.stat_result]:
- """Stats the file and returns an os.stat_result or None on error.
-
- """
+ """Stats the file and returns an os.stat_result or None on error."""
try:
return os.stat(filename)
except Exception as e:
try:
return os.stat(filename)
except Exception as e:
@@
-279,9
+276,7
@@
def get_file_raw_ctime(filename: str) -> Optional[float]:
def get_file_md5(filename: str) -> str:
def get_file_md5(filename: str) -> str:
- """Hashes filename's contents and returns an MD5.
-
- """
+ """Hashes filename's contents and returns an MD5."""
file_hash = hashlib.md5()
with open(filename, "rb") as f:
chunk = f.read(8192)
file_hash = hashlib.md5()
with open(filename, "rb") as f:
chunk = f.read(8192)
@@
-371,10
+366,9
@@
def get_file_mtime_timedelta(filename: str) -> Optional[datetime.timedelta]:
return get_file_timestamp_timedelta(filename, lambda x: x.st_mtime)
return get_file_timestamp_timedelta(filename, lambda x: x.st_mtime)
-def describe_file_timestamp(
- filename: str, extractor, *, brief=False
-) -> Optional[str]:
+def describe_file_timestamp(filename: str, extractor, *, brief=False) -> Optional[str]:
from datetime_utils import describe_duration, describe_duration_briefly
from datetime_utils import describe_duration, describe_duration_briefly
+
age = get_file_timestamp_age_seconds(filename, extractor)
if age is None:
return None
age = get_file_timestamp_age_seconds(filename, extractor)
if age is None:
return None
@@
-451,4
+445,5
@@
class FileWriter(object):
if __name__ == '__main__':
import doctest
if __name__ == '__main__':
import doctest
+
doctest.testmod()
doctest.testmod()