From c880f85ccdaee29adab8b47ad79eb7bdec507b57 Mon Sep 17 00:00:00 2001 From: David Lord Date: Wed, 17 Jul 2019 07:46:40 -0700 Subject: [PATCH] standardize license --- LICENSE.rst | 49 +++++++++++++++---------------------------------- setup.py | 6 +++--- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/LICENSE.rst b/LICENSE.rst index ef9c194..7b190ca 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -1,47 +1,28 @@ -`BSD 3-Clause `_ - -Copyright © 2011 by the Pallets team. - -Some rights reserved. +Copyright 2011 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. -We kindly ask you to use these themes in an unmodified manner only with -Pallets and Pallets-related projects, not for unrelated projects. If you -like the visual style and want to use it for your own projects, please -consider making some larger changes to the themes (such as changing font -faces, sizes, colors or margins). - -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. - ----- - -The initial implementation of itsdangerous was inspired by Django's -signing module. - -Copyright © Django Software Foundation and individual contributors. -All rights reserved. +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. diff --git a/setup.py b/setup.py index 6cdcf7b..ab6c5f8 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ readme = f.read() with io.open("src/itsdangerous/__init__.py", "rt", encoding="utf8") as f: - version = re.search(r"__version__ = \"(.*?)\"", f.read()).group(1) + version = re.search(r'__version__ = "(.*?)"', f.read()).group(1) setup( name="itsdangerous", @@ -19,10 +19,10 @@ "Code": "https://github.com/pallets/itsdangerous", "Issue tracker": "https://github.com/pallets/itsdangerous/issues", }, - license="BSD", + license="BSD-3-Clause", author="Armin Ronacher", author_email="armin.ronacher@active-4.com", - maintainer="Pallets Team", + maintainer="Pallets", maintainer_email="contact@palletsprojects.com", description="Various helpers to pass data to untrusted environments and back.", long_description=readme,