summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* bump to 0.4.60.4.6Adam Hupp2013-10-071-1/+1
|
* Fix failure on file-5.15. That has a bug and/or change in behviorAdam Hupp2013-10-072-7/+15
| | | | | | | where the first call to magic_load results in magic_error returning a string even though there was no error. Fixed by being more precise about checking the return values (either nul or -1 depending on function) rather than relying on magic_error.
* bump version to 0.4.50.4.5Adam Hupp2013-09-271-1/+1
|
* Don't hard-code version number when finding homebrew libraryAdam Hupp2013-09-271-2/+5
|
* bump version to 0.4.40.4.4Adam Hupp2013-09-271-1/+1
|
* Merge branch 'master' of github.com:ahupp/python-magic into aromanovich-masterAdam Hupp2013-09-273-0/+7
|\
| * Merge pull request #40 from DXist/masterAdam Hupp2013-09-273-0/+7
| |\ | | | | | | Add stdeb config
| | * Add stdeb configRinat Shigapov2013-08-203-0/+7
| | |
* | | Merge branch 'master' of https://github.com/aromanovich/python-magic into ↵Adam Hupp2013-09-275-64/+70
|\ \ \ | |/ / |/| | | | | | | | | | | | | | aromanovich-master Conflicts: test.py
| * | Add keep going functionalityAnton Romanovich2013-02-054-2/+16
| | |
| * | Fix testsAnton Romanovich2013-02-051-4/+6
| | |
| * | Refactor testsAnton Romanovich2013-02-041-49/+47
| | |
| * | Fix tests; introduce Travis CIAnton Romanovich2013-02-042-17/+21
| | |
* | | Use python 2.4-compatible threading.currentThread() callAdam Hupp2013-09-272-13/+17
| | |
* | | Update homebrew instructionsAdam Hupp2013-09-271-1/+1
| |/ |/|
* | fix bad merge of READMEAdam Hupp2013-06-031-1/+1
| |
* | add troubleshooting section and extended usage docsAdam Hupp2013-06-031-1/+25
| |
* | Add some commentsAdam Hupp2013-06-031-1/+26
| |
* | - avoid segfault when used in multiple threads via ↵Adam Hupp2013-06-022-22/+27
| | | | | | | | | | | | magic.from_buffer/from_file methods - add hard check to prevent this in the future (possibly breaking change)
* | add forgotten testdata fileAdam Hupp2012-11-021-0/+0
|/
* Support python 3Adam Hupp2012-11-012-22/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* cleanup README0.4.3Adam Hupp2012-09-171-1/+6
|
* update README to markdown format, and clarifyAdam Hupp2012-09-172-58/+59
|
* bump version to 0.4.3Adam Hupp2012-09-171-1/+1
|
* explain change to __del__Adam Hupp2012-09-171-0/+1
|
* Merge branch 'master' of github.com:ahupp/python-magicAdam Hupp2012-09-171-1/+1
|\
| * Merge pull request #19 from edevil/masterAdam Hupp2012-09-171-1/+1
| |\ | | | | | | Check if 'magic_close' still has a value on __del__()
| | * Check for magic_close as well. When python is exiting it can beAndre Cruz2012-07-251-1/+1
| |/ | | | | | | None already.
* | Merge branch 'master' of github.com:ahupp/python-magicAdam Hupp2012-09-172-6/+7
|\ \ | |/
| * Merge pull request #17 from fallgesetz/masterAdam Hupp2012-05-221-6/+7
| |\ | | | | | | Added libmagic.dylib path for homebrew package manager
| | * Added path to default homebrew install of libmagic on Mac OS XLeah Xue2012-05-211-6/+7
| |/
| * Merge pull request #16 from dusual/masterAdam Hupp2012-04-031-0/+0
| |\ | | | | | | Added a __init__.py file such that this can be used as a package
| | * adding the __init__ file , cannot work as a package till that is the caseAmit Sethi2012-03-281-0/+0
| |/
* | bump version to 0.4.2Adam Hupp2011-12-291-1/+1
|/
* Fix dylib look with patch from sacha@ssl.co.ukAdam Hupp2011-12-292-4/+6
|
* Bump version to 4.1Adam Hupp2011-12-291-1/+1
|
* Remove absolute path for libmagic.dylib on darwin to allow for other types ↵Adam Hupp2011-12-291-2/+2
| | | | of install
* Remove ctypes setup() dependency, already included in python >= 2.5Adam Hupp2011-01-311-1/+0
| | | | and it breaks pypi installs.
* Bump version, add contributors section to READMEAdam Hupp2010-11-212-6/+11
|
* 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
| |
* | Fix unit testAdam Hupp2010-11-211-2/+2
| | | | | | | | | | | | | | - remove charset from textfile mimetype that is now gone (libmagic version change? environment change? sunspots?) - Don't run filetype tests when testing charsets
* | reorder Mime args to preserve compatabilityAdam Hupp2010-11-211-1/+1
| |
* | - fix keyword to define requirementsLukasz Nowak2010-10-151-1/+1
| |
* | Add sample file for testing purpose.Nicolas Delaby2010-10-151-0/+2
| |
* | Add new feature which return mime_encoding of file.Nicolas Delaby2010-10-153-3/+28
|/
* avoid abort if you somehow double freeAdam Hupp2010-04-171-1/+3
|
* merge support for win32 from tehmazeAdam Hupp2010-04-021-1/+1
|
View Lorry Controller Status