summaryrefslogtreecommitdiff
path: root/magic.py
Commit message (Collapse)AuthorAgeFilesLines
* Don't hard-code version number when finding homebrew libraryAdam Hupp2013-09-271-2/+5
|
* Merge branch 'master' of https://github.com/aromanovich/python-magic into ↵Adam Hupp2013-09-271-2/+5
|\ | | | | | | | | | | | | aromanovich-master Conflicts: test.py
| * Add keep going functionalityAnton Romanovich2013-02-051-2/+5
| |
* | Use python 2.4-compatible threading.currentThread() callAdam Hupp2013-09-271-2/+2
| |
* | Add some commentsAdam Hupp2013-06-031-1/+26
| |
* | - avoid segfault when used in multiple threads via ↵Adam Hupp2013-06-021-18/+16
|/ | | | | | magic.from_buffer/from_file methods - add hard check to prevent this in the future (possibly breaking change)
* Support python 3Adam Hupp2012-11-011-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | - various unicode/bytes test fixes - resolve an (undocumented?) change in how ctypes converts unicode strings to char string by always using the default filesystem encoding. Test Plan: adam@gaba:~/github/python-magic$ python test.py ..... ---------------------------------------------------------------------- Ran 5 tests in 0.010s OK adam@gaba:~/github/python-magic$ python3 test.py ..... ---------------------------------------------------------------------- Ran 5 tests in 0.016s OK adam@gaba:~/github/python-magic$ ~/opt/python3.3/bin/python3 test.py .. snip ... ---------------------------------------------------------------------- Ran 5 tests in 0.025s
* explain change to __del__Adam Hupp2012-09-171-0/+1
|
* Check for magic_close as well. When python is exiting it can beAndre Cruz2012-07-251-1/+1
| | | | None already.
* Added path to default homebrew install of libmagic on Mac OS XLeah Xue2012-05-211-6/+7
|
* Fix dylib look with patch from sacha@ssl.co.ukAdam Hupp2011-12-291-4/+5
|
* Remove absolute path for libmagic.dylib on darwin to allow for other types ↵Adam Hupp2011-12-291-2/+2
| | | | of install
* Consolidate darwin/win32 library loading. Tested on OSX.Adam Hupp2010-11-211-12/+5
|
* Merge branch 'master' of https://github.com/FlaPer87/python-magic into ↵Adam Hupp2010-11-211-9/+26
|\ | | | | | | FlaPer87-master
| * Commet error fix. I was hungryFlavio Percoco Premoli2010-09-301-5/+5
| |
| * Some load improvementsFlavio Percoco Premoli2010-09-301-6/+23
| |
* | reorder Mime args to preserve compatabilityAdam Hupp2010-11-211-1/+1
| |
* | Add new feature which return mime_encoding of file.Nicolas Delaby2010-10-151-2/+7
|/
* avoid abort if you somehow double freeAdam Hupp2010-04-171-1/+3
|
* Added win32 compatibilitymaze2010-04-021-2/+5
|
* remove unnessary handler in _del_Adam Hupp2010-03-311-5/+1
|
* - Grab fix for OSX from bitbucket.org/pfw/Adam Hupp2010-03-311-0/+7
| | | | - Produce a more sensible error message when no library is found
* initial commitAdam Hupp2010-03-311-0/+207