diff --git a/.travis-devel-requirements.txt b/.travis-devel-requirements.txt index afdc2649..18ee00ec 100644 --- a/.travis-devel-requirements.txt +++ b/.travis-devel-requirements.txt @@ -1,3 +1,6 @@ git+git://github.com/mitsuhiko/werkzeug.git#egg=Werkzeug git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2 git+git://github.com/mitsuhiko/itsdangerous.git#egg=itsdangerous + +# extra dependencies +git+git://github.com/jek/blinker.git#egg=blinker diff --git a/.travis-lowest-requirements.txt b/.travis-lowest-requirements.txt index 54498262..5066d698 100644 --- a/.travis-lowest-requirements.txt +++ b/.travis-lowest-requirements.txt @@ -1,3 +1,6 @@ Werkzeug==0.7 Jinja2==2.4 itsdangerous==0.21 + +# extra dependencies +blinker==1.0 diff --git a/.travis-release-requirements.txt b/.travis-release-requirements.txt index e69de29b..f2f097cb 100644 --- a/.travis-release-requirements.txt +++ b/.travis-release-requirements.txt @@ -0,0 +1,2 @@ +# extra dependencies +blinker diff --git a/CHANGES b/CHANGES index fb0a511b..d2208969 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,13 @@ Flask Changelog Here you can see the full list of changes between each Flask release. +Version 0.10.2 +-------------- + +(bugfix release, release date to be announced) + +- Fixed broken `test_appcontext_signals()` test case. + Version 0.10.1 -------------- @@ -15,7 +22,7 @@ Version 0.10.1 - Added support for byte strings back to the session system. This broke compatibility with the common case of people putting binary data for token verification into the session. -- Fixed an issue were registering the same method twice for the same endpoint +- Fixed an issue where registering the same method twice for the same endpoint would trigger an exception incorrectly. Version 0.10 diff --git a/docs/advanced_foreword.rst b/docs/advanced_foreword.rst index f7e70a71..53df8175 100644 --- a/docs/advanced_foreword.rst +++ b/docs/advanced_foreword.rst @@ -64,6 +64,6 @@ compatible Python code `_. If you do want to dive into Python 3 already have a look at the -:ref:`python3_support` page. +:ref:`python3-support` page. Continue to :ref:`installation` or the :ref:`quickstart`. diff --git a/docs/api.rst b/docs/api.rst index 48bb001e..75295b1e 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -365,12 +365,12 @@ You can instead just do this:: from flask import json For usage examples, read the :mod:`json` documentation in the standard -lirbary. The following extensions are by default applied to the stdlib's +library. The following extensions are by default applied to the stdlib's JSON module: 1. ``datetime`` objects are serialized as :rfc:`822` strings. 2. Any object with an ``__html__`` method (like :class:`~flask.Markup`) - will ahve that method called and then the return value is serialized + will have that method called and then the return value is serialized as string. The :func:`~htmlsafe_dumps` function of this json module is also available @@ -505,7 +505,7 @@ Signals .. data:: signals_available - `True` if the signalling system is available. This is the case + `True` if the signaling system is available. This is the case when `blinker`_ is installed. .. data:: template_rendered @@ -728,7 +728,7 @@ some defaults to :meth:`~flask.Flask.add_url_rule` or general behavior: - `required_methods`: if this attribute is set, Flask will always add these methods when registering a URL rule even if the methods were - explicitly overriden in the ``route()`` call. + explicitly overridden in the ``route()`` call. Full example:: diff --git a/docs/quickstart.rst b/docs/quickstart.rst index b455e070..bb08b007 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -318,7 +318,7 @@ Now the interesting part is that in HTML4 and XHTML1, the only methods a form can submit to the server are `GET` and `POST`. But with JavaScript and future HTML standards you can use the other methods as well. Furthermore HTTP has become quite popular lately and browsers are no longer the only -clients that are using HTTP. For instance, many revision control system +clients that are using HTTP. For instance, many revision control systems use it. .. _HTTP RFC: http://www.ietf.org/rfc/rfc2068.txt @@ -666,8 +666,8 @@ About Responses The return value from a view function is automatically converted into a response object for you. If the return value is a string it's converted -into a response object with the string as response body, an ``200 OK`` -error code and a ``text/html`` mimetype. The logic that Flask applies to +into a response object with the string as response body, a ``200 OK`` +status code and a ``text/html`` mimetype. The logic that Flask applies to converting return values into response objects is as follows: 1. If a response object of the correct type is returned it's directly diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py index e061932d..45ca45d9 100644 --- a/flask/testsuite/signals.py +++ b/flask/testsuite/signals.py @@ -102,7 +102,7 @@ class SignalsTestCase(FlaskTestCase): def record_push(sender, **kwargs): recorded.append('push') def record_pop(sender, **kwargs): - recorded.append('push') + recorded.append('pop') @app.route('/') def index(): diff --git a/tox.ini b/tox.ini index a8782e00..b09458d9 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,5 @@ envlist = py26, py27, pypy, py33 [testenv] -deps = -egit+git://github.com/mitsuhiko/werkzeug.git#egg=werkzeug +deps = blinker commands = python run-tests.py []