Merge branch '0.10-maintenance'

11 years ago · d517f35d60
45 changed files with 45 additions and 45 deletions
--- a/examples/flaskr/flaskr.py
+++ b/examples/flaskr/flaskr.py
@ -6,7 +6,7 @@
    A microblog example application written as Flask tutorial with
    Flask and sqlite3.

-    :copyright: (c) 2010 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/examples/flaskr/flaskr_tests.py
+++ b/examples/flaskr/flaskr_tests.py
@ -5,7 +5,7 @@

    Tests the Flaskr application.

-    :copyright: (c) 2010 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import os
--- a/examples/jqueryexample/jqueryexample.py
+++ b/examples/jqueryexample/jqueryexample.py
@ -5,7 +5,7 @@

    A simple application that shows how Flask and jQuery get along.

-    :copyright: (c) 2010 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 from flask import Flask, jsonify, render_template, request
--- a/examples/minitwit/minitwit.py
+++ b/examples/minitwit/minitwit.py
@ -5,7 +5,7 @@

    A microblogging application written with Flask and sqlite3.

-    :copyright: (c) 2010 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/examples/minitwit/minitwit_tests.py
+++ b/examples/minitwit/minitwit_tests.py
@ -5,7 +5,7 @@

    Tests the MiniTwit application.

-    :copyright: (c) 2010 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import os
--- a/flask/init.py
+++ b/flask/init.py
@ -6,7 +6,7 @@
    A microframework based on Werkzeug.  It's extensively documented
    and follows best practice patterns.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/_compat.py
+++ b/flask/_compat.py
@ -7,7 +7,7 @@
    version of six so we don't have to depend on a specific version
    of it.

-    :copyright: (c) 2013 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import sys
--- a/flask/app.py
+++ b/flask/app.py
@ -5,7 +5,7 @@

    This module implements the central WSGI application object.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/blueprints.py
+++ b/flask/blueprints.py
@ -6,7 +6,7 @@
    Blueprints are the recommended way to implement larger or more
    pluggable applications in Flask 0.7 and later.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 from functools import update_wrapper
--- a/flask/config.py
+++ b/flask/config.py
@ -5,7 +5,7 @@

    Implements the configuration related objects.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/ctx.py
+++ b/flask/ctx.py
@ -5,7 +5,7 @@

    Implements the objects required to keep the context.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/debughelpers.py
+++ b/flask/debughelpers.py
@ -5,7 +5,7 @@

    Various helpers to make the development experience better.

-    :copyright: (c) 2011 by Armin Ronacher.
+1   :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 from ._compat import implements_to_string
--- a/flask/ext/init.py
+++ b/flask/ext/init.py
@ -14,7 +14,7 @@
    We're switching from namespace packages because it was just too painful for
    everybody involved.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/exthook.py
+++ b/flask/exthook.py
@ -16,7 +16,7 @@

    This is used by `flask.ext`.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import sys
--- a/flask/globals.py
+++ b/flask/globals.py
@ -6,7 +6,7 @@
    Defines all the global objects that are proxies to the current
    active context.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/helpers.py
+++ b/flask/helpers.py
@ -5,7 +5,7 @@

    Implements various helpers.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/json.py
+++ b/flask/json.py
@ -5,7 +5,7 @@

    Implementation helpers for the JSON support in Flask.

-    :copyright: (c) 2012 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import io
--- a/flask/logging.py
+++ b/flask/logging.py
@ -5,7 +5,7 @@

    Implements the logging support for Flask.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/module.py
+++ b/flask/module.py
@ -5,7 +5,7 @@

    Implements a class that represents module blueprints.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/sessions.py
+++ b/flask/sessions.py
@ -5,7 +5,7 @@

    Implements cookie based sessions based on itsdangerous.

-    :copyright: (c) 2012 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/signals.py
+++ b/flask/signals.py
@ -6,7 +6,7 @@
    Implements signals based on blinker if available, otherwise
    falls silently back to a noop

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 signals_available = False
--- a/flask/templating.py
+++ b/flask/templating.py
@ -5,7 +5,7 @@

    Implements the bridge to Jinja2.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import posixpath
--- a/flask/testing.py
+++ b/flask/testing.py
@ -6,7 +6,7 @@
    Implements test support helpers.  This module is lazily imported
    and usually not used in production environments.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/init.py
+++ b/flask/testsuite/init.py
@ -6,7 +6,7 @@
    Tests Flask itself.  The majority of Flask is already tested
    as part of Werkzeug.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/appctx.py
+++ b/flask/testsuite/appctx.py
@ -5,7 +5,7 @@

    Tests the application context.

-    :copyright: (c) 2012 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/basic.py
+++ b/flask/testsuite/basic.py
@ -5,7 +5,7 @@

    The basic functionality.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/blueprints.py
+++ b/flask/testsuite/blueprints.py
@ -5,7 +5,7 @@

    Blueprints (and currently modules)

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/config.py
+++ b/flask/testsuite/config.py
@ -5,7 +5,7 @@

    Configuration and instances.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/deprecations.py
+++ b/flask/testsuite/deprecations.py
@ -5,7 +5,7 @@

    Tests deprecation support.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/examples.py
+++ b/flask/testsuite/examples.py
@ -5,7 +5,7 @@

    Tests the examples.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import os
--- a/flask/testsuite/ext.py
+++ b/flask/testsuite/ext.py
@ -5,7 +5,7 @@

    Tests the extension import thing.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/helpers.py
+++ b/flask/testsuite/helpers.py
@ -5,7 +5,7 @@

    Various helpers.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/regression.py
+++ b/flask/testsuite/regression.py
@ -5,7 +5,7 @@

    Tests regressions.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/reqctx.py
+++ b/flask/testsuite/reqctx.py
@ -5,7 +5,7 @@

    Tests the request context.

-    :copyright: (c) 2012 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/signals.py
+++ b/flask/testsuite/signals.py
@ -5,7 +5,7 @@

    Signalling.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/subclassing.py
+++ b/flask/testsuite/subclassing.py
@ -6,7 +6,7 @@
    Test that certain behavior of flask can be customized by
    subclasses.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import flask
--- a/flask/testsuite/templating.py
+++ b/flask/testsuite/templating.py
@ -5,7 +5,7 @@

    Template functionality

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/testing.py
+++ b/flask/testsuite/testing.py
@ -5,7 +5,7 @@

    Test client and more.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/testsuite/views.py
+++ b/flask/testsuite/views.py
@ -5,7 +5,7 @@

    Pluggable views.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/flask/views.py
+++ b/flask/views.py
@ -5,7 +5,7 @@

    This module provides class-based views inspired by the ones in Django.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 from .globals import request
--- a/flask/wrappers.py
+++ b/flask/wrappers.py
@ -5,7 +5,7 @@

    Implements the WSGI wrappers (request and response).

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """

--- a/scripts/flask-07-upgrade.py
+++ b/scripts/flask-07-upgrade.py
@ -16,7 +16,7 @@
    the most common patterns at least.  The diff it generates should be
    hand reviewed and not applied blindly without making backups.

-    :copyright: (c) Copyright 2011 by Armin Ronacher.
+    :copyright: (c) Copyright 2014 by Armin Ronacher.
    :license: see LICENSE for more details.
 """
 import re
--- a/scripts/flaskext_compat.py
+++ b/scripts/flaskext_compat.py
@ -12,7 +12,7 @@
        flaskext_compat.activate()
        from flask.ext import foo

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import sys
--- a/scripts/flaskext_test.py
+++ b/scripts/flaskext_test.py
@ -5,7 +5,7 @@

    Tests the Flask extensions.

-    :copyright: (c) 2010 by Ali Afshar.
+    :copyright: (c) 2014 by Ali Afshar.
    :license: BSD, see LICENSE for more details.
 """

--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@ -7,7 +7,7 @@
    Helper script that performs a release.  Does pretty much everything
    automatically for us.

-    :copyright: (c) 2011 by Armin Ronacher.
+    :copyright: (c) 2014 by Armin Ronacher.
    :license: BSD, see LICENSE for more details.
 """
 import sys