projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a bunch of __init__.py's; maybe this will fix import
[python_utils.git]
/
file_utils.py
diff --git
a/file_utils.py
b/file_utils.py
index f273ea4f9a5fe08da8c1f15e3108c65b7c33d0ea..6bcfc75db47efa6d2da2327cdd42284c589901d4 100644
(file)
--- a/
file_utils.py
+++ b/
file_utils.py
@@
-4,20
+4,18
@@
import datetime
import errno
import datetime
import errno
+import glob
import hashlib
import hashlib
+import io
import logging
import os
import logging
import os
-import io
import pathlib
import re
import time
import pathlib
import re
import time
-from typing import Optional
-import glob
-from os.path import isfile, join, exists
-from typing import List, TextIO
+from os.path import exists, isfile, join
+from typing import List, Optional, TextIO
from uuid import uuid4
from uuid import uuid4
-
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
@@
-332,13
+330,13
@@
def get_file_md5(filename: str) -> str:
def set_file_raw_atime(filename: str, atime: float):
mtime = get_file_raw_mtime(filename)
def set_file_raw_atime(filename: str, atime: float):
mtime = get_file_raw_mtime(filename)
- assert mtime
+ assert mtime
is not None
os.utime(filename, (atime, mtime))
def set_file_raw_mtime(filename: str, mtime: float):
atime = get_file_raw_atime(filename)
os.utime(filename, (atime, mtime))
def set_file_raw_mtime(filename: str, mtime: float):
atime = get_file_raw_atime(filename)
- assert atime
+ assert atime
is not None
os.utime(filename, (atime, mtime))
os.utime(filename, (atime, mtime))
@@
-349,9
+347,7
@@
def set_file_raw_atime_and_mtime(filename: str, ts: float = None):
os.utime(filename, None)
os.utime(filename, None)
-def convert_file_timestamp_to_datetime(
- filename: str, producer
-) -> Optional[datetime.datetime]:
+def convert_file_timestamp_to_datetime(filename: str, producer) -> Optional[datetime.datetime]:
ts = producer(filename)
if ts is not None:
return datetime.datetime.fromtimestamp(ts)
ts = producer(filename)
if ts is not None:
return datetime.datetime.fromtimestamp(ts)
@@
-391,9
+387,7
@@
def get_file_mtime_age_seconds(filename: str) -> Optional[int]:
return get_file_timestamp_age_seconds(filename, lambda x: x.st_mtime)
return get_file_timestamp_age_seconds(filename, lambda x: x.st_mtime)
-def get_file_timestamp_timedelta(
- filename: str, extractor
-) -> Optional[datetime.timedelta]:
+def get_file_timestamp_timedelta(filename: str, extractor) -> Optional[datetime.timedelta]:
age = get_file_timestamp_age_seconds(filename, extractor)
if age is not None:
return datetime.timedelta(seconds=float(age))
age = get_file_timestamp_age_seconds(filename, extractor)
if age is not None:
return datetime.timedelta(seconds=float(age))