Merge branch '1.0.x'

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 os
 import pkgutil

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
 

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
 import sys

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
 

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
 # its Revised BSD License. Copyright © 2015 CERN.

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
 """
 import os
 import textwrap

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
 import io

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
 import sys

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
 from uuid import uuid4

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
 import sys

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
 import sys

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
 

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
 

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
 from flask._compat import StringIO

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 logging
 

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

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
 """
 import pytest
 from werkzeug.exceptions import Forbidden

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
 from werkzeug.http import parse_set_header