etorres/rbackup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use try..finally blocks to ensure calls within context manager

Browse Source
This commit is contained in:
Eric Torres
2019-04-17 20:22:28 -07:00
parent bbeebecd4f
commit a7d30cf91d
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/backup
View File

@@ -108,8 +108,10 @@ def change_umask():
"""Creates a context manager in which the umask is changed. This is to ensure that """Creates a context manager in which the umask is changed. This is to ensure that
the script's desired umask is not visible to the user. the script's desired umask is not visible to the user.
""" """
try:
old_umask = os.umask(SCRIPT_UMASK) old_umask = os.umask(SCRIPT_UMASK)
yield yield
finally:
os.umask(old_umask) os.umask(old_umask)

6
rbackup/config.py
View File

@@ -95,8 +95,11 @@ def merge_include_files():
:return: path-like object :return: path-like object
""" """
try:
# filelist is guaranteed to exist at this point
filelist = merge_files(get_files_by_suffix("-include.conf")) filelist = merge_files(get_files_by_suffix("-include.conf"))
yield filelist yield filelist
finally:
filelist.unlink() filelist.unlink()
@@ -106,8 +109,11 @@ def merge_exclude_files():
:return: path-like object :return: path-like object
""" """
try:
# filelist is guaranteed to exist at this point
filelist = merge_files(get_files_by_suffix("-exclude.conf")) filelist = merge_files(get_files_by_suffix("-exclude.conf"))
yield filelist yield filelist
finally:
filelist.unlink() filelist.unlink()