diff options
author | David Lord <davidism@gmail.com> | 2019-02-23 14:20:43 -0800 |
---|---|---|
committer | David Lord <davidism@gmail.com> | 2019-02-23 14:20:43 -0800 |
commit | 79ee6ce0ed93c6da73512f069d7db866d955df04 (patch) | |
tree | dd71d1cf1af60fece9884e8044eaa7bca5713f53 | |
parent | 12fa6db477f85db97d42f334acf20f7b63d1219d (diff) | |
download | markupsafe-79ee6ce0ed93c6da73512f069d7db866d955df04.tar.gz |
update license data
-rw-r--r-- | LICENSE.rst | 35 | ||||
-rw-r--r-- | README.rst | 6 | ||||
-rw-r--r-- | setup.py | 6 | ||||
-rw-r--r-- | src/markupsafe/__init__.py | 4 | ||||
-rw-r--r-- | src/markupsafe/_compat.py | 4 | ||||
-rw-r--r-- | src/markupsafe/_constants.py | 4 | ||||
-rw-r--r-- | src/markupsafe/_native.py | 4 | ||||
-rw-r--r-- | src/markupsafe/_speedups.c | 4 |
8 files changed, 31 insertions, 36 deletions
diff --git a/LICENSE.rst b/LICENSE.rst index 28c9258..9d227a0 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -1,33 +1,28 @@ -`BSD 3-Clause <https://opensource.org/licenses/BSD-3-Clause>`_ - -Copyright © 2010 by the Pallets team. - -Some rights reserved. +Copyright 2010 Pallets Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Redistributions of source code must retain the above copyright +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name of the copyright holder nor the names of its +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -49,15 +49,15 @@ libraries that use it. In order to grow the community of contributors and users, and allow the maintainers to devote more time to the projects, `please donate today`_. -.. _please donate today: https://psfmember.org/civicrm/contribute/transact?reset=1&id=20 +.. _please donate today: https://palletsprojects.com/donate Links ----- -* Website: https://www.palletsprojects.com/p/markupsafe/ +* Website: https://palletsprojects.com/p/markupsafe/ * Documentation: https://markupsafe.palletsprojects.com/ -* License: `BSD <https://github.com/pallets/markupsafe/blob/master/LICENSE.rst>`_ +* License: `BSD-3-Clause <https://github.com/pallets/markupsafe/blob/master/LICENSE.rst>`_ * Releases: https://pypi.org/project/MarkupSafe/ * Code: https://github.com/pallets/markupsafe * Issue tracker: https://github.com/pallets/markupsafe/issues @@ -53,16 +53,16 @@ def run_setup(with_binary): setup( name="MarkupSafe", version=version, - url="https://www.palletsprojects.com/p/markupsafe/", + url="https://palletsprojects.com/p/markupsafe/", project_urls={ "Documentation": "https://markupsafe.palletsprojects.com/", "Code": "https://github.com/pallets/markupsafe", "Issue tracker": "https://github.com/pallets/markupsafe/issues", }, - license="BSD", + license="BSD-3-Clause", author="Armin Ronacher", author_email="armin.ronacher@active-4.com", - maintainer="Pallets Team", + maintainer="The Pallets Team", maintainer_email="contact@palletsprojects.com", description="Safely add untrusted strings to HTML/XML markup.", long_description=readme, diff --git a/src/markupsafe/__init__.py b/src/markupsafe/__init__.py index 5e09525..f9eeeb7 100644 --- a/src/markupsafe/__init__.py +++ b/src/markupsafe/__init__.py @@ -6,8 +6,8 @@ markupsafe Implements an escape function and a Markup string to replace HTML special characters with safe representations. -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ import re import string diff --git a/src/markupsafe/_compat.py b/src/markupsafe/_compat.py index e51d57d..bc05090 100644 --- a/src/markupsafe/_compat.py +++ b/src/markupsafe/_compat.py @@ -3,8 +3,8 @@ markupsafe._compat ~~~~~~~~~~~~~~~~~~ -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ import sys diff --git a/src/markupsafe/_constants.py b/src/markupsafe/_constants.py index 83670cb..7c57c2d 100644 --- a/src/markupsafe/_constants.py +++ b/src/markupsafe/_constants.py @@ -3,8 +3,8 @@ markupsafe._constants ~~~~~~~~~~~~~~~~~~~~~ -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ HTML_ENTITIES = { diff --git a/src/markupsafe/_native.py b/src/markupsafe/_native.py index 245f03a..cd08752 100644 --- a/src/markupsafe/_native.py +++ b/src/markupsafe/_native.py @@ -5,8 +5,8 @@ markupsafe._native Native Python implementation used when the C module is not compiled. -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ from . import Markup from ._compat import text_type diff --git a/src/markupsafe/_speedups.c b/src/markupsafe/_speedups.c index b27435e..12d2c4a 100644 --- a/src/markupsafe/_speedups.c +++ b/src/markupsafe/_speedups.c @@ -5,8 +5,8 @@ * C implementation of escaping for better performance. Used instead of * the native Python implementation when compiled. * - * :copyright: © 2010 by the Pallets team. - * :license: BSD, see LICENSE for more details. + * :copyright: 2010 Pallets + * :license: BSD-3-Clause */ #include <Python.h> |