diff --git a/LICENSE b/LICENSE index f53f6de..a048352 100644 --- a/LICENSE +++ b/LICENSE @@ -1,31 +1,28 @@ -Copyright (c) 2014-2019 by Giovanni Barillari and contributors. - -Some rights reserved. +Copyright 2014 Giovanni Barillari 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 notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. +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. - * The names of the contributors may not be used to endorse or - promote products derived from this software without specific - prior written permission. +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 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 -OWNER 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. +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/renoir/_internal.py b/renoir/_internal.py index 34fc8b3..4ab6c2f 100644 --- a/renoir/_internal.py +++ b/renoir/_internal.py @@ -5,8 +5,8 @@ Provides internally used helpers and objects. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ diff --git a/renoir/_shortcuts.py b/renoir/_shortcuts.py index 0affae5..730184b 100644 --- a/renoir/_shortcuts.py +++ b/renoir/_shortcuts.py @@ -5,8 +5,8 @@ Some shortcuts - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ import hashlib diff --git a/renoir/apis.py b/renoir/apis.py index 2735093..fef5339 100644 --- a/renoir/apis.py +++ b/renoir/apis.py @@ -5,8 +5,8 @@ Provides the main apis for the templating system. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ import os diff --git a/renoir/cache.py b/renoir/cache.py index 9481f80..297128b 100644 --- a/renoir/cache.py +++ b/renoir/cache.py @@ -5,8 +5,8 @@ Provides caching utils. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ import os diff --git a/renoir/contents.py b/renoir/contents.py index 3a374d7..64fd0da 100644 --- a/renoir/contents.py +++ b/renoir/contents.py @@ -5,8 +5,8 @@ Provides structures for templating system. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ # TODO: check unicode conversions diff --git a/renoir/debug.py b/renoir/debug.py index fdec893..e7a9e3e 100644 --- a/renoir/debug.py +++ b/renoir/debug.py @@ -5,12 +5,12 @@ Provides debugging utilities. - :copyright: (c) 2014-2019 by Giovanni Barillari + :copyright: 2014 Giovanni Barillari Quite a lot of magic comes from Flask (http://flask.pocoo.org) :copyright: (c) 2014 by Armin Ronacher. - :license: BSD, see LICENSE for more details. + :license: BSD-3-Clause """ import sys diff --git a/renoir/errors.py b/renoir/errors.py index 342fdc9..a1e32a4 100644 --- a/renoir/errors.py +++ b/renoir/errors.py @@ -5,8 +5,8 @@ Provides errors. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ from .helpers import TemplateReference diff --git a/renoir/extensions.py b/renoir/extensions.py index 56e065a..9dcc7b2 100644 --- a/renoir/extensions.py +++ b/renoir/extensions.py @@ -5,8 +5,8 @@ Provides base classes to create extensions. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ diff --git a/renoir/helpers.py b/renoir/helpers.py index 685ea0f..83b77ee 100644 --- a/renoir/helpers.py +++ b/renoir/helpers.py @@ -5,8 +5,8 @@ Provides helpers. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ import traceback diff --git a/renoir/lexers.py b/renoir/lexers.py index c44ecb1..a529ca6 100644 --- a/renoir/lexers.py +++ b/renoir/lexers.py @@ -5,8 +5,8 @@ Provides lexers for templates parsing. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ diff --git a/renoir/parser.py b/renoir/parser.py index 6bba04a..54033dd 100644 --- a/renoir/parser.py +++ b/renoir/parser.py @@ -5,8 +5,8 @@ Provides the templating parser. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ import os diff --git a/renoir/writers.py b/renoir/writers.py index be412f5..2a96dc0 100644 --- a/renoir/writers.py +++ b/renoir/writers.py @@ -5,8 +5,8 @@ Provides the writers for the templating system. - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. + :copyright: 2014 Giovanni Barillari + :license: BSD-3-Clause """ from io import StringIO diff --git a/tests/test_cache.py b/tests/test_cache.py index 8016809..f747e44 100644 --- a/tests/test_cache.py +++ b/tests/test_cache.py @@ -4,9 +4,6 @@ ----------- Tests cache module. - - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. """ import pytest diff --git a/tests/test_extensions.py b/tests/test_extensions.py index b5f3ebb..6b6205a 100644 --- a/tests/test_extensions.py +++ b/tests/test_extensions.py @@ -4,9 +4,6 @@ ---------------- Tests extensions module. - - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. """ import pytest diff --git a/tests/test_parser.py b/tests/test_parser.py index d3d5f1e..0f6e1e5 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -4,9 +4,6 @@ ------------ Tests parser module. - - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. """ import pytest diff --git a/tests/test_templater.py b/tests/test_templater.py index 50f4fd9..3d99fb5 100644 --- a/tests/test_templater.py +++ b/tests/test_templater.py @@ -4,9 +4,6 @@ --------------- Tests templater module. - - :copyright: (c) 2014-2019 by Giovanni Barillari - :license: BSD, see LICENSE for more details. """ import os