summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorAdam Hupp <adam@hupp.org>2017-12-04 11:55:27 -0800
committerAdam Hupp <adam@hupp.org>2017-12-04 11:55:27 -0800
commita0b9f316fda16b21923bb57e1de9a98789befbba (patch)
treebdd5da3016316b3c0d788939258aaf60f4135c7b /README.md
parent10e20995b5f4b8f8131b7e69912882bb81393cb2 (diff)
downloadpython-magic-a0b9f316fda16b21923bb57e1de9a98789befbba.tar.gz
Merge in compatability mode with libmagic
The libmagic distribution uses the same package name `magic` as python-magic, but has an incompatible API. This change merges in a copy of libmagic's bindings, wrapped to give deprecation warnings. This is intended to a) mitigate the short-term pain to users and packagers who need to figure out which to use, and b) give us a path to merging the two sets of bindings. I'd be happy for libmagic to take over this package if we could find a path to it.
Diffstat (limited to 'README.md')
-rw-r--r--README.md9
1 files changed, 0 insertions, 9 deletions
diff --git a/README.md b/README.md
index fa33f65..044752c 100644
--- a/README.md
+++ b/README.md
@@ -113,14 +113,6 @@ To run against a specific python version:
Minor version bumps should be backwards compatible. Major bumps are not.
-## Name Conflict
-
-There are, sadly, two libraries which use the module name `magic`.
-Both have been around for quite a while. If you are using this module
-and get an error using a method like `open`, your code is expecting
-the other one. Hopefully one day these will be reconciled.
-
-
## Author
Written by Adam Hupp in 2001 for a project that never got off the
@@ -151,4 +143,3 @@ python-magic is distributed under the MIT license. See the included
LICENSE file for details.
I am providing code in the repository to you under an open source license. Because this is my personal repository, the license you receive to my code is from me and not my employer (Facebook).
-