projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let's call the base class' c'tor first, eh?
[python_utils.git]
/
file_utils.py
diff --git
a/file_utils.py
b/file_utils.py
index cd37f3069c70efd5c0f835e3362adbdf18d52e24..deda45e033f6a5adb65a4b1d7725e2b346030797 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
+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,11
+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 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 is not None
os.utime(filename, (atime, mtime))
os.utime(filename, (atime, mtime))
@@
-434,8
+434,8
@@
def describe_file_mtime(filename: str, *, brief=False) -> Optional[str]:
return describe_file_timestamp(filename, lambda x: x.st_mtime, brief=brief)
return describe_file_timestamp(filename, lambda x: x.st_mtime, brief=brief)
-def touch_file(filename: str, *, mode: Optional[int] = 0o666)
-> bool
:
-
return
pathlib.Path(filename, mode=mode).touch()
+def touch_file(filename: str, *, mode: Optional[int] = 0o666):
+ pathlib.Path(filename, mode=mode).touch()
def expand_globs(in_filename: str):
def expand_globs(in_filename: str):
@@
-470,14
+470,14
@@
class FileWriter(object):
self.filename = filename
uuid = uuid4()
self.tempfile = f'{filename}-{uuid}.tmp'
self.filename = filename
uuid = uuid4()
self.tempfile = f'{filename}-{uuid}.tmp'
- self.handle = None
+ self.handle
: Optional[TextIO]
= None
- def __enter__(self) ->
io.TextIOWrapper
:
+ def __enter__(self) ->
TextIO
:
assert not does_path_exist(self.tempfile)
self.handle = open(self.tempfile, mode="w")
return self.handle
assert not does_path_exist(self.tempfile)
self.handle = open(self.tempfile, mode="w")
return self.handle
- def __exit__(self, exc_type, exc_val, exc_tb) ->
bool
:
+ def __exit__(self, exc_type, exc_val, exc_tb) ->
Optional[bool]
:
if self.handle is not None:
self.handle.close()
cmd = f'/bin/mv -f {self.tempfile} {self.filename}'
if self.handle is not None:
self.handle.close()
cmd = f'/bin/mv -f {self.tempfile} {self.filename}'