diff options
| author | Adam Hupp <adam@hupp.org> | 2016-11-25 09:47:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 09:47:26 -0800 |
| commit | 7ac0c2cc3ef7c3af32a5c51b2187edbf58898a63 (patch) | |
| tree | 510bcb251ff0aaba9bc5ff21a2bda78fb423ff51 | |
| parent | 682309a2bf412b22d07ee50f92bab09a77f56556 (diff) | |
| parent | 3192ed83950a286ca7767f51ae3e53af40f9f7f7 (diff) | |
| download | python-magic-7ac0c2cc3ef7c3af32a5c51b2187edbf58898a63.tar.gz | |
Merge pull request #121 from SergeySatskiy/master
Handling 'mime' and 'mime_encoding' independently
| -rw-r--r-- | magic.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |