summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* bump to 0.4.120.4.12Adam Hupp2016-07-041-1/+1
|
* Return str rather than bytes for the description strings on python3.Adam Hupp2016-06-052-8/+13
| | | | | Assumes utf-8 encoding from magic return values, which I hope is always the case.
* propagate exception in other branch of 509 hackAdam Hupp2016-06-052-1/+14
|
* Merge pull request #106 from tgoodyear/patch-1Adam Hupp2016-06-011-2/+3
|\ | | | | Fix typos in README.md
| * Fix typos in README.mdTrevor Goodyear2016-05-311-2/+3
|/ | | Changed `recociled` to `reconciled`. Changed `explictly` to `explicitly`.
* what did 3.2 ever do for youAdam Hupp2016-03-211-1/+0
|
* hopefully fix tests on whatever travisci usesAdam Hupp2016-03-211-9/+18
|
* throw proper exception on each python version0.4.11Adam Hupp2016-03-201-6/+3
|
* bump versioncleanAdam Hupp2016-03-201-1/+1
|
* restore test dirAdam Hupp2016-03-201-1/+1
|
* rename the unicode lambda file to "lambda" and rename it at runtime when ↵Adam Hupp2016-03-202-10/+15
| | | | | | running the test. distutils can't handle unicode filenames at install time.
* Update README.mdAdam Hupp2016-01-161-0/+3
|
* Merge pull request #99 from koobs/patch-1Adam Hupp2016-01-041-1/+2
|\ | | | | Match license= to LICENSE, Add Python 2 to Trove
| * Match license= to LICENSE, Add Python 2 to TroveKubilay Kocak2016-01-021-1/+2
|/ | | | | | * Update the distutils license field to match MIT license as specified in: LICENSE file in repository Trove classifier * Add Python :: 2 to trove classifier to declare explicit (PEP20) 2/3 compatibility
* Merge pull request #95 from Rafiot/travisAdam Hupp2015-11-241-0/+5
|\ | | | | Force use trusty on travis
| * Force use trustyRaphaël Vinot2015-11-241-0/+5
|/
* Merge pull request #93 from vaibhavsagar/patch-1Adam Hupp2015-11-091-0/+1
|\ | | | | Add Python 3 trove classifier.
| * Add Python 3 trove classifier.Vaibhav Sagar2015-11-091-0/+1
|/ | | This is so that tools like https://github.com/brettcannon/caniusepython3 work properly.
* Merge pull request #91 from Rafiot/fix_exceptionAdam Hupp2015-11-061-1/+6
|\ | | | | Fix MagicException
| * Fix MagicExceptionRaphaël Vinot2015-11-061-1/+6
| | | | | | | | self.message was missing, causing `_handle509Bug` to fail.
* | Merge pull request #92 from Rafiot/up_travisAdam Hupp2015-11-064-3/+19
|\ \ | |/ |/| Fix travis config
| * Fix travis configRaphaël Vinot2015-11-064-3/+19
|/ | | | The tests fail on travis ci because the libmagic 5.09 is buggy.
* force GMT so test runs consistentlytz-testfixAdam Hupp2015-11-061-2/+6
|
* bump to 0.4.10, for removal of spurious fileAdam Hupp2015-10-201-1/+1
|
* bump to 0.4.9 with pruning of test/ dirAdam Hupp2015-10-192-1/+2
|
* remove spurious newlinesAdam Hupp2015-10-191-19/+0
|
* update test output for libmagic in debian jessieAdam Hupp2015-10-191-4/+4
|
* Replace per-thread Magic instance with a lock. Tested with a stressAdam Hupp2015-10-191-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.8Adam Hupp2015-10-191-7/+1
|
* add distutils manifestAdam Hupp2015-10-191-0/+2
|
* update license classifierAdam Hupp2015-10-181-1/+1
|
* bump to 0.4.7Adam Hupp2015-10-181-1/+1
|
* Include tests in the sdist tarballAdam Hupp2015-07-2910-10/+12
|
* Merge pull request #84 from tritium21/patch-1Adam Hupp2015-06-151-3/+1
|\ | | | | Change windows instructions
| * Update README.mdAlexander Walters2015-06-151-1/+1
| |
| * Change windows instructionsAlexander Walters2015-06-151-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-1Adam Hupp2015-02-261-14/+20
|\ | | | | Updated README.md
| * Updated README.mdChris Seymour2015-02-261-14/+20
|/ | | Switched indentation based code blocks to backticks with language declarion for syntax highlighting.
* simple test script, ensuring correct envAdam Hupp2015-01-071-0/+10
|
* silence open file warnings in python 3Adam Hupp2015-01-061-3/+4
|
* Update README.mdAdam Hupp2015-01-061-0/+4
| | | Document naming conflict with the file version of magic.py.
* Merge pull request #68 from EugeneSusla/masterAdam Hupp2014-12-011-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 Susla2014-11-281-1/+3
|/ | | | using cygwin's python
* Merge pull request #67 from seils/masterAdam Hupp2014-11-112-7/+22
|\ | | | | Add support for MAGIC_COMPRESS through Magic constructor.
| * Add support for MAGIC_COMPRESS through Magic constructor.Zach Seils2014-11-102-7/+22
|/
* Always use utf-8 regardless of filesystem encodingAdam Hupp2014-05-301-3/+4
|
* fix license in setup.py to match LICENSE fileAdam Hupp2014-05-061-1/+1
|
* Merge pull request #59 from brutasse/fix/py3Adam Hupp2014-04-273-3/+15
|\ | | | | PyPI classifiers, 2.6 compatibility
| * Workaround sys.version_info not being a named tuple on py26Bruno Renié2014-03-041-2/+2
| |
| * Add some classifiers for PyPIBruno Renié2014-03-041-1/+12
| |
View Lorry Controller Status