Merge branch 'master' into master

.coveragerc

@@ -0,0 +1,11 @@
+[run]
+branch = True
+source =
+    flask
+    tests
+
+[paths]
+source =
+    flask
+    .tox/*/lib/python*/site-packages/flask
+    .tox/pypy/site-packages/flask

.travis.yml

@@ -1,52 +1,61 @@
 sudo: false
 language: python
 
-python:
-  - "2.6"
-  - "2.7"
-  - "pypy"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.6"
-
-env:
-  - REQUIREMENTS=lowest
-  - REQUIREMENTS=lowest-simplejson
-  - REQUIREMENTS=release
-  - REQUIREMENTS=release-simplejson
-  - REQUIREMENTS=devel
-  - REQUIREMENTS=devel-simplejson
-
 matrix:
-  exclude:
-    # Python 3 support currently does not work with lowest requirements
-    - python: "3.3"
-      env: REQUIREMENTS=lowest
-    - python: "3.3"
-      env: REQUIREMENTS=lowest-simplejson
-    - python: "3.4"
-      env: REQUIREMENTS=lowest
-    - python: "3.4"
-      env: REQUIREMENTS=lowest-simplejson
-    - python: "3.5"
-      env: REQUIREMENTS=lowest
-    - python: "3.5"
-      env: REQUIREMENTS=lowest-simplejson
-    - python: "3.6"
-      env: REQUIREMENTS=lowest
-    - python: "3.6"
-      env: REQUIREMENTS=lowest-simplejson
+  include:
+    - python: 3.6
+      env: TOXENV=py-release,codecov
+    - python: 3.5
+      env: TOXENV=py-release,codecov
+    - python: 3.4
+      env: TOXENV=py-release,codecov
+    - python: 3.3
+      env: TOXENV=py-release,codecov
+    - python: 2.7
+      env: TOXENV=py-release,codecov
+    - python: 2.6
+      env: TOXENV=py-release,codecov
+    - python: pypy
+      env: TOXENV=py-release,codecov
+    - python: nightly
+      env: TOXENV=py-release
+    - python: 3.6
+      env: TOXENV=docs-html
+    - python: 3.6
+      env: TOXENV=py-release-simplejson,codecov
+    - python: 2.7
+      env: TOXENV=py-release-simplejson,codecov
+    - python: pypy
+      env: TOXENV=py-release-simplejson,codecov
+    - python: 3.6
+      env: TOXENV=py-devel,codecov
+    - python: 3.3
+      env: TOXENV=py-devel,codecov
+    - python: 2.7
+      env: TOXENV=py-devel,codecov
+    - python: 2.6
+      env: TOXENV=py-devel,codecov
+    - python: pypy
+      env: TOXENV=py-devel,codecov
+    - python: 3.6
+      env: TOXENV=py-lowest,codecov
+    - python: 3.3
+      env: TOXENV=py-lowest,codecov
+    - python: 2.7
+      env: TOXENV=py-lowest,codecov
+    - python: 2.6
+      env: TOXENV=py-lowest,codecov
+    - python: pypy
+      env: TOXENV=py-lowest,codecov
 
 install:
-    - pip install tox
+  - pip install tox
 
 script:
-    - tox -e py-$REQUIREMENTS
+  - tox
 
-branches:
-  except:
-    - website
+cache:
+  - pip
 
 notifications:
   email: false

AUTHORS

@@ -21,6 +21,7 @@ Patches and Suggestions
 - Florent Xicluna
 - Georg Brandl
 - Jeff Widman @jeffwidman
+- Joshua Bronson @jab
 - Justin Quick
 - Kenneth Reitz
 - Keyan Pishdadian

CHANGES

@@ -11,18 +11,75 @@ Major release, unreleased
 - Make `app.run()` into a noop if a Flask application is run from the
   development server on the command line.  This avoids some behavior that
   was confusing to debug for newcomers.
+- Change default configuration `JSONIFY_PRETTYPRINT_REGULAR=False`. jsonify()
+  method returns compressed response by default, and pretty response in
+  debug mode.
+- Change Flask.__init__ to accept two new keyword arguments, ``host_matching``
+  and ``static_host``. This enables ``host_matching`` to be set properly by the
+  time the constructor adds the static route, and enables the static route to
+  be properly associated with the required host. (``#1559``)
+- ``send_file`` supports Unicode in ``attachment_filename``. (`#2223`_)
+- Pass ``_scheme`` argument from ``url_for`` to ``handle_build_error``.
+  (`#2017`_)
+- Add support for ``provide_automatic_options`` in ``add_url_rule`` to disable
+  adding OPTIONS method when the ``view_func`` argument is not a class.
+  (`#1489`_).
+- ``MethodView`` can inherit method handlers from base classes. (`#1936`_)
+- Errors caused while opening the session at the beginning of the request are
+  handled by the app's error handlers. (`#2254`_)
+- Blueprints gained ``json_encoder`` and ``json_decoder`` attributes to
+  override the app's encoder and decoder. (`#1898`_)
+- ``Flask.make_response`` raises ``TypeError`` instead of ``ValueError`` for
+  bad response types. The error messages have been improved to describe why the
+  type is invalid. (`#2256`_)
+- Add ``routes`` CLI command to output routes registered on the application.
+  (`#2259`_)
+- Show warning when session cookie domain is a bare hostname or an IP
+  address, as these may not behave properly in some browsers, such as Chrome.
+  (`#2282`_)
+- Allow IP address as exact session cookie domain. (`#2282`_)
+- ``SESSION_COOKIE_DOMAIN`` is set if it is detected through ``SERVER_NAME``.
+  (`#2282`_)
+- Auto-detect zero-argument app factory called ``create_app`` or ``make_app``
+  from ``FLASK_APP``. (`#2297`_)
+- Factory functions are not required to take a ``script_info`` parameter to
+  work with the ``flask`` command. If they take a single parameter or a
+  parameter named ``script_info``, the ``ScriptInfo`` object will be passed.
+  (`#2319`_)
+
+.. _#1489: https://github.com/pallets/flask/pull/1489
+.. _#1898: https://github.com/pallets/flask/pull/1898
+.. _#1936: https://github.com/pallets/flask/pull/1936
+.. _#2017: https://github.com/pallets/flask/pull/2017
+.. _#2223: https://github.com/pallets/flask/pull/2223
+.. _#2254: https://github.com/pallets/flask/pull/2254
+.. _#2256: https://github.com/pallets/flask/pull/2256
+.. _#2259: https://github.com/pallets/flask/pull/2259
+.. _#2282: https://github.com/pallets/flask/pull/2282
+.. _#2297: https://github.com/pallets/flask/pull/2297
+.. _#2319: https://github.com/pallets/flask/pull/2319
+
+Version 0.12.2
+--------------
+
+Released on May 16 2017
+
+- Fix a bug in `safe_join` on Windows.
 
 Version 0.12.1
 --------------
 
-Bugfix release, unreleased
+Bugfix release, released on March 31st 2017
 
 - Prevent `flask run` from showing a NoAppException when an ImportError occurs
   within the imported application module.
 - Fix encoding behavior of ``app.config.from_pyfile`` for Python 3. Fix
   ``#2118``.
-- Use the``SERVER_NAME`` config if it is present as default values for
+- Use the ``SERVER_NAME`` config if it is present as default values for
   ``app.run``. ``#2109``, ``#2152``
+- Call `ctx.auto_pop` with the exception object instead of `None`, in the
+  event that a `BaseException` such as `KeyboardInterrupt` is raised in a
+  request handler.
 
 Version 0.12
 ------------
@@ -127,6 +184,8 @@ Released on May 29th 2016, codename Absinthe.
 - Don't leak exception info of already catched exceptions to context teardown
   handlers (pull request ``#1393``).
 - Allow custom Jinja environment subclasses (pull request ``#1422``).
+- Updated extension dev guidelines.
+
 - ``flask.g`` now has ``pop()`` and ``setdefault`` methods.
 - Turn on autoescape for ``flask.templating.render_template_string`` by default
   (pull request ``#1515``).

CONTRIBUTING.rst

@@ -31,6 +31,42 @@ Submitting patches
 - Try to follow `PEP8 <https://www.python.org/dev/peps/pep-0008/>`_, but you
   may ignore the line-length-limit if following it would make the code uglier.
 
+First time setup
+----------------
+
+- Download and install the `latest version of git`_.
+- Configure git with your `username`_ and `email`_.
+- Make sure you have a `GitHub account`_.
+- Fork Flask to your GitHub account by clicking the `Fork`_ button.
+- `Clone`_ your GitHub fork locally.
+- Add the main repository as a remote to update later.
+  ``git remote add pallets https://github.com/pallets/flask``
+
+.. _GitHub account: https://github.com/join
+.. _latest version of git: https://git-scm.com/downloads
+.. _username: https://help.github.com/articles/setting-your-username-in-git/
+.. _email: https://help.github.com/articles/setting-your-email-in-git/
+.. _Fork: https://github.com/pallets/flask/pull/2305#fork-destination-box
+.. _Clone: https://help.github.com/articles/fork-a-repo/#step-2-create-a-local-clone-of-your-fork
+
+Start coding
+------------
+
+- Create a branch to identify the issue you would like to work on (e.g.
+  ``2287-dry-test-suite``)
+- Using your favorite editor, make your changes, `committing as you go`_.
+- Try to follow `PEP8`_, but you may ignore the line length limit if following
+  it would make the code uglier.
+- Include tests that cover any code changes you make. Make sure the test fails
+  without your patch. `Run the tests. <contributing-testsuite_>`_.
+- Push your commits to GitHub and `create a pull request`_.
+- Celebrate 🎉
+
+.. _committing as you go: http://dont-be-afraid-to-commit.readthedocs.io/en/latest/git/commandlinegit.html#commit-your-changes
+.. _PEP8: https://pep8.org/
+.. _create a pull request: https://help.github.com/articles/creating-a-pull-request/
+
+.. _contributing-testsuite:
 
 Running the testsuite
 ---------------------
@@ -52,9 +88,19 @@ Install Flask as an editable package using the current source::
     cd flask
     pip install --editable .
 
+Running the testsuite
+---------------------
+
+The minimal requirement for running the testsuite is ``pytest``.  You can
+install it with::
+
+    pip install pytest
+
 Then you can run the testsuite with::
 
-    pytest
+    pytest tests/
+
+**Shortcut**: ``make test`` will ensure ``pytest`` is installed, and run it.
 
 With only pytest installed, a large part of the testsuite will get skipped
 though.  Whether this is relevant depends on which part of Flask you're working
@@ -69,6 +115,8 @@ of ``pytest``. You can install it with::
 The ``tox`` command will then run all tests against multiple combinations
 Python versions and dependency versions.
 
+**Shortcut**: ``make tox-test`` will ensure ``tox`` is installed, and run it.
+
 Running test coverage
 ---------------------
 Generating a report of lines that do not have unit test coverage can indicate where
@@ -87,6 +135,9 @@ Generate a HTML report can be done using this command::
 
 Full docs on ``coverage.py`` are here: https://coverage.readthedocs.io
 
+**Shortcut**: ``make cov`` will ensure ``pytest-cov`` is installed, run it, display the results, *and* save the HTML report.
+
+
 Caution
 =======
 pushing

Makefile

@@ -6,6 +6,10 @@ test:
 	pip install -r test-requirements.txt
 	tox -e py-release
 
+cov:
+	pip install -r test-requirements.txt -q
+	FLASK_DEBUG= py.test --cov-report term --cov-report html --cov=flask --cov=examples tests examples
+
 audit:
 	python setup.py audit
 

docs/_templates/sidebarintro.html

@@ -1,6 +1,6 @@
 <h3>About Flask</h3>
 <p>
-  Flask is a micro webdevelopment framework for Python.  You are currently
+  Flask is a micro web development framework for Python.  You are currently
   looking at the documentation of the development version.
 </p>
 <h3>Other Formats</h3>

docs/blueprints.rst

@@ -177,11 +177,11 @@ the `template_folder` parameter to the :class:`Blueprint` constructor::
     admin = Blueprint('admin', __name__, template_folder='templates')
 
 For static files, the path can be absolute or relative to the blueprint
-resource folder.  
+resource folder.
 
-The template folder is added to the search path of templates but with a lower 
-priority than the actual application's template folder. That way you can 
-easily override templates that a blueprint provides in the actual application. 
+The template folder is added to the search path of templates but with a lower
+priority than the actual application's template folder. That way you can
+easily override templates that a blueprint provides in the actual application.
 This also means that if you don't want a blueprint template to be accidentally
 overridden, make sure that no other blueprint or actual application template
 has the same relative path. When multiple blueprints provide the same relative
@@ -194,7 +194,7 @@ want to render the template ``'admin/index.html'`` and you have provided
 this: :file:`yourapplication/admin/templates/admin/index.html`. The reason
 for the extra ``admin`` folder is to avoid getting our template overridden
 by a template named ``index.html`` in the actual application template
-folder.  
+folder.
 
 To further reiterate this: if you have a blueprint named ``admin`` and you
 want to render a template called :file:`index.html` which is specific to this
@@ -245,4 +245,22 @@ Here is an example for a "404 Page Not Found" exception::
     def page_not_found(e):
         return render_template('pages/404.html')
 
+Most errorhandlers will simply work as expected; however, there is a caveat
+concerning handlers for 404 and 405 exceptions.  These errorhandlers are only
+invoked from an appropriate ``raise`` statement or a call to ``abort`` in another
+of the blueprint's view functions; they are not invoked by, e.g., an invalid URL
+access.  This is because the blueprint does not "own" a certain URL space, so
+the application instance has no way of knowing which blueprint errorhandler it
+should run if given an invalid URL.  If you would like to execute different
+handling strategies for these errors based on URL prefixes, they may be defined
+at the application level using the ``request`` proxy object::
+
+    @app.errorhandler(404)
+    @app.errorhandler(405)
+    def _handle_api_error(ex):
+        if request.path.startswith('/api/'):
+            return jsonify_error(ex)
+        else:
+            return ex
+
 More information on error handling see :ref:`errorpages`.