summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Hupp <adam@hupp.org>2014-01-04 05:25:26 -0800
committerAdam Hupp <adam@hupp.org>2014-01-04 05:25:26 -0800
commita0f2249dad53b0c6e7997560d8d333830c578b96 (patch)
tree6df8ae9fe246e1a4a74526de93f62d3894ffcdba
parentfc73c30c2fd4d17babfd1a7b864c96ba517f6130 (diff)
downloadpython-magic-a0f2249dad53b0c6e7997560d8d333830c578b96.tar.gz
Relicense under the MIT license (apparently the PSF one isn't
appropriate) and distribute text with the code.
-rw-r--r--LICENSE21
-rw-r--r--README.md3
2 files changed, 23 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..044612d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2001-2014 Adam Hupp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index 36d4b90..dc56edd 100644
--- a/README.md
+++ b/README.md
@@ -81,5 +81,6 @@ Thanks to these folks on github who submitted features and bugfixes.
## License
-python-magic is distributed under the [PSF License](http://www.python.org/psf/license/).
+python-magic is distributed under the MIT license. See the included
+LICENSE file for details.