diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 220046ed..00000000 --- a/AUTHORS +++ /dev/null @@ -1,12 +0,0 @@ -Flask is developed and maintained by the Pallets team and community -contributors. It was created by Armin Ronacher. The core maintainers -are: - -- David Lord (davidism) -- Adrian Mönnich (ThiefMaster) -- Armin Ronacher (mitsuhiko) -- Marcus Unterwaditzer (untitaker) - -A full list of contributors is available from git with:: - - git shortlog -sne diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 8f9252f4..00000000 --- a/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -Copyright © 2010 by the Pallets team. - -Some rights reserved. - -Redistribution and use in source and binary forms of the software as -well as documentation, with or without modification, are permitted -provided that the following conditions are met: - -* 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. - -* 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. diff --git a/LICENSE.rst b/LICENSE.rst new file mode 100644 index 00000000..9d227a0c --- /dev/null +++ b/LICENSE.rst @@ -0,0 +1,28 @@ +Copyright 2010 Pallets + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +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. + +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 +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/artwork/LICENSE b/artwork/LICENSE deleted file mode 100644 index c6df416c..00000000 --- a/artwork/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2010 by Armin Ronacher. - -Some rights reserved. - -This logo or a modified version may be used by anyone to refer to the -Flask project, but does not indicate endorsement by the project. - -Redistribution and use in source (the SVG file) and binary forms (rendered -PNG files etc.) of the image, with or without modification, are permitted -provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright - notice and this list of conditions. - -* The names of the contributors to the Flask software (see AUTHORS) may - not be used to endorse or promote products derived from this software - without specific prior written permission. - -Note: we would appreciate that you make the image a link to -http://flask.pocoo.org/ if you use it on a web page. diff --git a/artwork/LICENSE.rst b/artwork/LICENSE.rst new file mode 100644 index 00000000..605e41cb --- /dev/null +++ b/artwork/LICENSE.rst @@ -0,0 +1,19 @@ +Copyright 2010 Pallets + +This logo or a modified version may be used by anyone to refer to the +Flask project, but does not indicate endorsement by the project. + +Redistribution and use in source (SVG) and binary (renders in PNG, etc.) +forms, with or without modification, are permitted provided that the +following conditions are met: + +1. Redistributions of source code must retain the above copyright + notice and this list of conditions. + +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 would appreciate that you make the image a link to +https://palletsprojects.com/p/flask/ if you use it in a medium that +supports links. diff --git a/docs/license.rst b/docs/license.rst index 696ee676..24c42a91 100644 --- a/docs/license.rst +++ b/docs/license.rst @@ -1,48 +1,19 @@ License ======= -Flask is licensed under a three clause BSD License. It basically means: -do whatever you want with it as long as the copyright in Flask sticks -around, the conditions are not modified and the disclaimer is present. -Furthermore you must not use the names of the authors to promote derivatives -of the software without written consent. +Source License +-------------- -The full license text can be found below (:ref:`flask-license`). For the -documentation and artwork different licenses apply. +This license applies to all files in the Flask repository and source +distribution. This includes Flask's source code, the examples, and +tests, as well as the documentation. -.. _authors: - -Authors -------- - -.. include:: ../AUTHORS - -General License Definitions ---------------------------- - -The following section contains the full license texts for Flask and the -documentation. - -- "AUTHORS" hereby refers to all the authors listed in the - :ref:`authors` section. - -- The ":ref:`flask-license`" applies to all the source code shipped as - part of Flask (Flask itself as well as the examples and the unittests) - as well as documentation. - -- The ":ref:`artwork-license`" applies to the project's Horn-Logo. - -.. _flask-license: - -Flask License -------------- - -.. include:: ../LICENSE +.. include:: ../LICENSE.rst -.. _artwork-license: +Artwork License +--------------- -Flask Artwork License ---------------------- +This license applies to Flask's logo. -.. include:: ../artwork/LICENSE +.. include:: ../artwork/LICENSE.rst diff --git a/flask/__init__.py b/flask/__init__.py index 59f0fff5..1189e751 100644 --- a/flask/__init__.py +++ b/flask/__init__.py @@ -6,8 +6,8 @@ A microframework based on Werkzeug. It's extensively documented and follows best practice patterns. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ __version__ = '1.0.3' diff --git a/flask/__main__.py b/flask/__main__.py index 4aee6543..41e32687 100644 --- a/flask/__main__.py +++ b/flask/__main__.py @@ -5,8 +5,8 @@ Alias for flask.run for the command line. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ if __name__ == '__main__': diff --git a/flask/_compat.py b/flask/_compat.py index dfbaae94..2f42e5b2 100644 --- a/flask/_compat.py +++ b/flask/_compat.py @@ -7,8 +7,8 @@ version of six so we don't have to depend on a specific version of it. - :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/flask/app.py b/flask/app.py index c3a455ac..0396865e 100644 --- a/flask/app.py +++ b/flask/app.py @@ -5,8 +5,8 @@ This module implements the central WSGI application object. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import os diff --git a/flask/blueprints.py b/flask/blueprints.py index 3673f03b..a1498f69 100644 --- a/flask/blueprints.py +++ b/flask/blueprints.py @@ -6,8 +6,8 @@ Blueprints are the recommended way to implement larger or more pluggable applications in Flask 0.7 and later. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ from functools import update_wrapper diff --git a/flask/cli.py b/flask/cli.py index 3eb93b3f..13914071 100644 --- a/flask/cli.py +++ b/flask/cli.py @@ -5,8 +5,8 @@ A simple command line application to run flask apps. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ from __future__ import print_function diff --git a/flask/config.py b/flask/config.py index a5475ed1..e941a804 100644 --- a/flask/config.py +++ b/flask/config.py @@ -5,8 +5,8 @@ Implements the configuration related objects. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import os diff --git a/flask/ctx.py b/flask/ctx.py index ec8e787e..d87f0221 100644 --- a/flask/ctx.py +++ b/flask/ctx.py @@ -5,8 +5,8 @@ Implements the objects required to keep the context. - :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/flask/debughelpers.py b/flask/debughelpers.py index e9765f20..28935831 100644 --- a/flask/debughelpers.py +++ b/flask/debughelpers.py @@ -5,8 +5,8 @@ Various helpers to make the development experience better. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import os diff --git a/flask/globals.py b/flask/globals.py index 7d50a6f6..292c002f 100644 --- a/flask/globals.py +++ b/flask/globals.py @@ -6,8 +6,8 @@ Defines all the global objects that are proxies to the current active context. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ from functools import partial diff --git a/flask/helpers.py b/flask/helpers.py index 158edc5c..c71ce3d8 100644 --- a/flask/helpers.py +++ b/flask/helpers.py @@ -5,8 +5,8 @@ Implements various helpers. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import os diff --git a/flask/json/__init__.py b/flask/json/__init__.py index c24286c9..dbc7f137 100644 --- a/flask/json/__init__.py +++ b/flask/json/__init__.py @@ -3,8 +3,8 @@ flask.json ~~~~~~~~~~ -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ import codecs import io diff --git a/flask/json/tag.py b/flask/json/tag.py index 11c966c5..4508ad61 100644 --- a/flask/json/tag.py +++ b/flask/json/tag.py @@ -38,8 +38,8 @@ processes dicts first, so insert the new tag at the front of the order since app.session_interface.serializer.register(TagOrderedDict, index=0) -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ from base64 import b64decode, b64encode diff --git a/flask/logging.py b/flask/logging.py index 389c2c22..4ce671b8 100644 --- a/flask/logging.py +++ b/flask/logging.py @@ -3,8 +3,8 @@ flask.logging ~~~~~~~~~~~~~ -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ from __future__ import absolute_import diff --git a/flask/sessions.py b/flask/sessions.py index c8b7d4e9..c24667d9 100644 --- a/flask/sessions.py +++ b/flask/sessions.py @@ -5,8 +5,8 @@ Implements cookie based sessions based on itsdangerous. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import hashlib diff --git a/flask/signals.py b/flask/signals.py index 18f26307..1bbc778d 100644 --- a/flask/signals.py +++ b/flask/signals.py @@ -6,8 +6,8 @@ Implements signals based on blinker if available, otherwise falls silently back to a noop. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ signals_available = False diff --git a/flask/templating.py b/flask/templating.py index 02402008..1c1c7b81 100644 --- a/flask/templating.py +++ b/flask/templating.py @@ -5,8 +5,8 @@ Implements the bridge to Jinja2. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ from jinja2 import BaseLoader, Environment as BaseEnvironment, \ diff --git a/flask/testing.py b/flask/testing.py index 114c5cc3..f0d48063 100644 --- a/flask/testing.py +++ b/flask/testing.py @@ -6,8 +6,8 @@ Implements test support helpers. This module is lazily imported and usually not used in production environments. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import werkzeug diff --git a/flask/views.py b/flask/views.py index 1f2c997b..303dca7f 100644 --- a/flask/views.py +++ b/flask/views.py @@ -5,8 +5,8 @@ This module provides class-based views inspired by the ones in Django. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ from .globals import request diff --git a/flask/wrappers.py b/flask/wrappers.py index 12eff2c7..4e166968 100644 --- a/flask/wrappers.py +++ b/flask/wrappers.py @@ -5,8 +5,8 @@ Implements the WSGI wrappers (request and response). - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ from werkzeug.exceptions import BadRequest diff --git a/tests/conftest.py b/tests/conftest.py index 7b42d6c7..6ef01349 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,8 +3,8 @@ tests.conftest ~~~~~~~~~~~~~~ - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import gc diff --git a/tests/test_appctx.py b/tests/test_appctx.py index 678bf510..c163df49 100644 --- a/tests/test_appctx.py +++ b/tests/test_appctx.py @@ -5,8 +5,8 @@ Tests the application context. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import pytest diff --git a/tests/test_basic.py b/tests/test_basic.py index 169081e3..587781b3 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -5,8 +5,8 @@ The basic functionality. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import re diff --git a/tests/test_blueprints.py b/tests/test_blueprints.py index 465079cd..d12b71b6 100644 --- a/tests/test_blueprints.py +++ b/tests/test_blueprints.py @@ -5,8 +5,8 @@ Blueprints (and currently modules) - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import functools diff --git a/tests/test_cli.py b/tests/test_cli.py index 55833f86..2ac6bbe6 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -3,8 +3,8 @@ tests.test_cli ~~~~~~~~~~~~~~ - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ # This file was part of Flask-CLI and was modified under the terms of diff --git a/tests/test_config.py b/tests/test_config.py index 5584ed25..5a2950ab 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -3,8 +3,8 @@ tests.test_config ~~~~~~~~~~~~~~~~~ - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ from datetime import timedelta diff --git a/tests/test_helpers.py b/tests/test_helpers.py index d85d9f6e..b2542d0e 100644 --- a/tests/test_helpers.py +++ b/tests/test_helpers.py @@ -5,8 +5,8 @@ Various helpers. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import datetime diff --git a/tests/test_instance_config.py b/tests/test_instance_config.py index bc912c64..4aedc8d5 100644 --- a/tests/test_instance_config.py +++ b/tests/test_instance_config.py @@ -3,8 +3,8 @@ tests.test_instance ~~~~~~~~~~~~~~~~~~~ - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import os diff --git a/tests/test_json_tag.py b/tests/test_json_tag.py index da5e6595..911b9360 100644 --- a/tests/test_json_tag.py +++ b/tests/test_json_tag.py @@ -3,8 +3,8 @@ tests.test_json_tag ~~~~~~~~~~~~~~~~~~~ -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ from datetime import datetime diff --git a/tests/test_logging.py b/tests/test_logging.py index 7577ecec..e51fede1 100644 --- a/tests/test_logging.py +++ b/tests/test_logging.py @@ -3,8 +3,8 @@ tests.test_logging ~~~~~~~~~~~~~~~~~~~ -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ import logging diff --git a/tests/test_regression.py b/tests/test_regression.py index d0765354..55b7ac3d 100644 --- a/tests/test_regression.py +++ b/tests/test_regression.py @@ -5,8 +5,8 @@ Tests regressions. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import gc diff --git a/tests/test_reqctx.py b/tests/test_reqctx.py index eea4b63f..41573eea 100644 --- a/tests/test_reqctx.py +++ b/tests/test_reqctx.py @@ -5,8 +5,8 @@ Tests the request context. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import pytest diff --git a/tests/test_signals.py b/tests/test_signals.py index fccd8e2f..e8f69d7e 100644 --- a/tests/test_signals.py +++ b/tests/test_signals.py @@ -5,8 +5,8 @@ Signalling. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import pytest diff --git a/tests/test_subclassing.py b/tests/test_subclassing.py index 43a1625a..226cedf0 100644 --- a/tests/test_subclassing.py +++ b/tests/test_subclassing.py @@ -6,8 +6,8 @@ Test that certain behavior of flask can be customized by subclasses. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import flask diff --git a/tests/test_templating.py b/tests/test_templating.py index 5073ae46..d0ce1e9d 100644 --- a/tests/test_templating.py +++ b/tests/test_templating.py @@ -5,8 +5,8 @@ Template functionality - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import pytest diff --git a/tests/test_testing.py b/tests/test_testing.py index 8c41d1fc..56ba7f58 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -5,8 +5,8 @@ Test client and more. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import click import pytest diff --git a/tests/test_user_error_handler.py b/tests/test_user_error_handler.py index f4a08f58..036ec176 100644 --- a/tests/test_user_error_handler.py +++ b/tests/test_user_error_handler.py @@ -3,8 +3,8 @@ tests.test_user_error_handler ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -:copyright: © 2010 by the Pallets team. -:license: BSD, see LICENSE for more details. +:copyright: 2010 Pallets +:license: BSD-3-Clause """ from werkzeug.exceptions import ( diff --git a/tests/test_views.py b/tests/test_views.py index 69bd9131..bac11b72 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -5,8 +5,8 @@ Pluggable views. - :copyright: © 2010 by the Pallets team. - :license: BSD, see LICENSE for more details. + :copyright: 2010 Pallets + :license: BSD-3-Clause """ import pytest