Skip to content

Check for cookie attribute before trying to delete it #244

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
May 17, 2021
Merged

Check for cookie attribute before trying to delete it #244

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ab68b2
Revert "Fix bug in Magic when destructor called too early"
jspricke May 16, 2021
12d0ea0
Check for cookie attribute before trying to delete it
jspricke May 16, 2021
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
4 changes: 1 addition & 3 deletions magic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ def __init__(self, mime=False, magic_file=None, mime_encoding=False,
raw - Do not try to decode "non-printable" chars.
extension - Print a slash-separated list of valid extensions for the file type found.
"""

self.cookie = None
self.flags = MAGIC_NONE
if mime:
self.flags |= MAGIC_MIME_TYPE
Expand Down Expand Up @@ -152,7 +150,7 @@ def __del__(self):
# incorrect fix for a threading problem, however I'm leaving
# it in because it's harmless and I'm slightly afraid to
# remove it.
if self.cookie and magic_close:
if hasattr(self, 'cookie') and self.cookie and magic_close:
magic_close(self.cookie)
self.cookie = None

Expand Down