Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update blob.py #390

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/ZODB/blob.py
Original file line number Diff line number Diff line change
Expand Up @@ -942,12 +942,16 @@ def remove_committed_dir(path):
filename = os.path.join(dirpath, filename)
remove_committed(filename)
shutil.rmtree(path)

link_or_copy = shutil.copy
Comment on lines 944 to 945
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last niggle: the empty line separates a function definition from the assignment, so please restore it.

else:
remove_committed = os.remove
remove_committed_dir = shutil.rmtree
link_or_copy = os.link
try:
link_or_copy = os.link
except AttributeError: # pragma: no cover
# FBO termux on Android.
# See https://github.com/zopefoundation/ZODB/issues/257
link_or_copy = shutil.copy


def find_global_Blob(module, class_):
Expand Down