Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | force GMT so test runs consistentlytz-testfix | Adam Hupp | 2015-11-06 | 1 | -2/+6 |
| | |||||
* | bump to 0.4.10, for removal of spurious file | Adam Hupp | 2015-10-20 | 1 | -1/+1 |
| | |||||
* | bump to 0.4.9 with pruning of test/ dir | Adam Hupp | 2015-10-19 | 2 | -1/+2 |
| | |||||
* | remove spurious newlines | Adam Hupp | 2015-10-19 | 1 | -19/+0 |
| | |||||
* | update test output for libmagic in debian jessie | Adam Hupp | 2015-10-19 | 1 | -4/+4 |
| | |||||
* | Replace per-thread Magic instance with a lock. Tested with a stress | Adam Hupp | 2015-10-19 | 1 | -24/+15 |
| | | | | | | stest that runs a 100 from_file checks on a 100 threads, concurrently. This almost immediately causes a SEVG without the lock, and runs successfully with the lock. | ||||
* | bump to 0.4.8 | Adam Hupp | 2015-10-19 | 1 | -7/+1 |
| | |||||
* | add distutils manifest | Adam Hupp | 2015-10-19 | 1 | -0/+2 |
| | |||||
* | update license classifier | Adam Hupp | 2015-10-18 | 1 | -1/+1 |
| | |||||
* | bump to 0.4.7 | Adam Hupp | 2015-10-18 | 1 | -1/+1 |
| | |||||
* | Include tests in the sdist tarball | Adam Hupp | 2015-07-29 | 10 | -10/+12 |
| | |||||
* | Merge pull request #84 from tritium21/patch-1 | Adam Hupp | 2015-06-15 | 1 | -3/+1 |
|\ | | | | | Change windows instructions | ||||
| * | Update README.md | Alexander Walters | 2015-06-15 | 1 | -1/+1 |
| | | |||||
| * | Change windows instructions | Alexander Walters | 2015-06-15 | 1 | -3/+1 |
|/ | | | Cygwin is huge and slow. File for Windows does not go through a posix translation layer, and are native windows libraries. It is much less of a pain in the butt to use File for Windows. | ||||
* | Merge pull request #74 from iiSeymour/patch-1 | Adam Hupp | 2015-02-26 | 1 | -14/+20 |
|\ | | | | | Updated README.md | ||||
| * | Updated README.md | Chris Seymour | 2015-02-26 | 1 | -14/+20 |
|/ | | | Switched indentation based code blocks to backticks with language declarion for syntax highlighting. | ||||
* | simple test script, ensuring correct env | Adam Hupp | 2015-01-07 | 1 | -0/+10 |
| | |||||
* | silence open file warnings in python 3 | Adam Hupp | 2015-01-06 | 1 | -3/+4 |
| | |||||
* | Update README.md | Adam Hupp | 2015-01-06 | 1 | -0/+4 |
| | | | Document naming conflict with the file version of magic.py. | ||||
* | Merge pull request #68 from EugeneSusla/master | Adam Hupp | 2014-12-01 | 1 | -1/+3 |
|\ | | | | | Fixed 'ImportError: failed to find libmagic. Check your installation' when using cygwin's python | ||||
| * | Fixed 'ImportError: failed to find libmagic. Check your installation' when ↵ | Eugene Susla | 2014-11-28 | 1 | -1/+3 |
|/ | | | | using cygwin's python | ||||
* | Merge pull request #67 from seils/master | Adam Hupp | 2014-11-11 | 2 | -7/+22 |
|\ | | | | | Add support for MAGIC_COMPRESS through Magic constructor. | ||||
| * | Add support for MAGIC_COMPRESS through Magic constructor. | Zach Seils | 2014-11-10 | 2 | -7/+22 |
|/ | |||||
* | Always use utf-8 regardless of filesystem encoding | Adam Hupp | 2014-05-30 | 1 | -3/+4 |
| | |||||
* | fix license in setup.py to match LICENSE file | Adam Hupp | 2014-05-06 | 1 | -1/+1 |
| | |||||
* | Merge pull request #59 from brutasse/fix/py3 | Adam Hupp | 2014-04-27 | 3 | -3/+15 |
|\ | | | | | PyPI classifiers, 2.6 compatibility | ||||
| * | Workaround sys.version_info not being a named tuple on py26 | Bruno Renié | 2014-03-04 | 1 | -2/+2 |
| | | |||||
| * | Add some classifiers for PyPI | Bruno Renié | 2014-03-04 | 1 | -1/+12 |
| | | |||||
| * | Add python 3.3 travis target | Bruno Renié | 2014-03-04 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #58 from SiggyF/windows-cygwinfind | Adam Hupp | 2014-04-27 | 1 | -1/+1 |
|\ \ | |/ |/| | find library in windows if cygwin path is added to PATH | ||||
| * | find library in windows if cygwin path is added to PATH | Fedor Baart | 2014-02-25 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #55 from asl97/patch-1 | Adam Hupp | 2014-01-27 | 1 | -1/+0 |
|\ | | | | | remove extra import sys | ||||
| * | remove extra import sys | asl97 | 2014-01-28 | 1 | -1/+0 |
|/ | |||||
* | Properly handle unicode filenames given in both byte-str and unicode | Adam Hupp | 2014-01-04 | 2 | -2/+17 |
| | | | | values, across both python 3 and 2. | ||||
* | Relicense under the MIT license (apparently the PSF one isn't | Adam Hupp | 2014-01-04 | 2 | -1/+23 |
| | | | | appropriate) and distribute text with the code. | ||||
* | Replace windows docs with cygwin instructions/path | Adam Hupp | 2014-01-04 | 2 | -9/+6 |
| | |||||
* | Merge pull request #48 from mojoTX/bugfix_issue47 | Adam Hupp | 2013-10-24 | 1 | -7/+7 |
|\ | | | | | Fixed issue with flags | ||||
| * | Fixed issue with flags | Michael Jarvis | 2013-10-24 | 1 | -7/+7 |
|/ | |||||
* | Hypothetical fix for issue https://github.com/ahupp/python-magic/issues/47 | Adam Hupp | 2013-10-23 | 1 | -3/+15 |
| | |||||
* | bump to 0.4.60.4.6 | Adam Hupp | 2013-10-07 | 1 | -1/+1 |
| | |||||
* | Fix failure on file-5.15. That has a bug and/or change in behvior | Adam Hupp | 2013-10-07 | 2 | -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.5 | Adam Hupp | 2013-09-27 | 1 | -1/+1 |
| | |||||
* | Don't hard-code version number when finding homebrew library | Adam Hupp | 2013-09-27 | 1 | -2/+5 |
| | |||||
* | bump version to 0.4.40.4.4 | Adam Hupp | 2013-09-27 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:ahupp/python-magic into aromanovich-master | Adam Hupp | 2013-09-27 | 3 | -0/+7 |
|\ | |||||
| * | Merge pull request #40 from DXist/master | Adam Hupp | 2013-09-27 | 3 | -0/+7 |
| |\ | | | | | | | Add stdeb config | ||||
| | * | Add stdeb config | Rinat Shigapov | 2013-08-20 | 3 | -0/+7 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/aromanovich/python-magic into ↵ | Adam Hupp | 2013-09-27 | 5 | -64/+70 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | aromanovich-master Conflicts: test.py | ||||
| * | | Add keep going functionality | Anton Romanovich | 2013-02-05 | 4 | -2/+16 |
| | | | |||||
| * | | Fix tests | Anton Romanovich | 2013-02-05 | 1 | -4/+6 |
| | | |