summaryrefslogtreecommitdiff
path: root/magic.py
diff options
context:
space:
mode:
authorSergeySatskiy <sergey.satskiy@gmail.com>2016-11-22 10:36:47 -0500
committerSergeySatskiy <sergey.satskiy@gmail.com>2016-11-22 10:36:47 -0500
commit3192ed83950a286ca7767f51ae3e53af40f9f7f7 (patch)
tree510bcb251ff0aaba9bc5ff21a2bda78fb423ff51 /magic.py
parent682309a2bf412b22d07ee50f92bab09a77f56556 (diff)
downloadpython-magic-3192ed83950a286ca7767f51ae3e53af40f9f7f7.tar.gz
Handling 'mime' and 'mime_encoding' independently
Diffstat (limited to 'magic.py')
-rw-r--r--magic.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/magic.py b/magic.py
index 7470b93..b07fd2b 100644
--- a/magic.py
+++ b/magic.py
@@ -53,7 +53,7 @@ class Magic:
self.flags = MAGIC_NONE
if mime:
self.flags |= MAGIC_MIME
- elif mime_encoding:
+ if mime_encoding:
self.flags |= MAGIC_MIME_ENCODING
if keep_going:
self.flags |= MAGIC_CONTINUE