Skip to content

For #36143: Explicitly closing download_attachment file handler #114

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 25, 2016
Merged

For #36143: Explicitly closing download_attachment file handler #114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
572e561
For #36143: Explicitly closing download_attachment file handler
Apr 25, 2016
55da503
For #36143: Dropping close in try clause, as it's redundant with else…
Apr 25, 2016
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
2 changes: 2 additions & 0 deletions shotgun_api3/shotgun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1612,6 +1612,8 @@ def download_attachment(self, attachment=False, file_path=None,
raise ShotgunFileDownloadError(err)
else:
if file_path:
if not fp.closed:
fp.close()
return file_path
else:
return attachment
Expand Down