From 582a5c7b89467b91662c9183c1b6d6b9d789e173 Mon Sep 17 00:00:00 2001 From: Stefano Costa Date: Fri, 14 Jun 2013 16:35:46 +0300 Subject: [PATCH 01/12] Correct small typo in internal link --- docs/advanced_foreword.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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`. From dda373823be9bfc69002ca4a01c2397ef5719141 Mon Sep 17 00:00:00 2001 From: augustusdsouza Date: Sat, 15 Jun 2013 00:01:34 +0530 Subject: [PATCH 02/12] Fixed a typo --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index fb0a511b..7e640c55 100644 --- a/CHANGES +++ b/CHANGES @@ -15,7 +15,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 From 88b74b376e3781ac0204c5a22dcd08279a21722e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Neuha=CC=88user?= Date: Wed, 19 Jun 2013 17:24:02 +0200 Subject: [PATCH 03/12] Don't use werkzeug dev version in tox anymore We don't need the dev version anymore since the lastest werkzeug release supports 3.3. --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index a8782e00..56c8f393 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,4 @@ envlist = py26, py27, pypy, py33 [testenv] -deps = -egit+git://github.com/mitsuhiko/werkzeug.git#egg=werkzeug commands = python run-tests.py [] From a225a304b822da292ed83f4c0ce28234a5d5ec5e Mon Sep 17 00:00:00 2001 From: Igor Mozharovsky Date: Sun, 23 Jun 2013 03:36:20 +0300 Subject: [PATCH 04/12] Fix typo --- docs/api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api.rst b/docs/api.rst index 48bb001e..9662187f 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -370,7 +370,7 @@ 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 From f88cc2d2f9d14d97e33ddd2bbaa4b1885db06e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Neuha=CC=88user?= Date: Thu, 27 Jun 2013 16:49:27 +0200 Subject: [PATCH 05/12] Fix broken test_appcontext_signals test case This fixes #781 and ensures that Flask is tested with blinker installed. --- .travis-devel-requirements.txt | 3 +++ .travis-lowest-requirements.txt | 3 +++ .travis-release-requirements.txt | 2 ++ CHANGES | 7 +++++++ flask/testsuite/signals.py | 2 +- tox.ini | 1 + 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis-devel-requirements.txt b/.travis-devel-requirements.txt index afdc2649..c8bd9c45 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 +hg+http://bitbucket.org/jek/blinker#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..89ef41d7 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 -------------- 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..711762fb 100644 --- a/tox.ini +++ b/tox.ini @@ -3,4 +3,5 @@ envlist = py26, py27, pypy, py33 [testenv] deps = -egit+git://github.com/mitsuhiko/werkzeug.git#egg=werkzeug + blinker commands = python run-tests.py [] From a364140bef85f9919fd3831d23ec6983cdf80be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Neuha=CC=88user?= Date: Thu, 27 Jun 2013 17:08:02 +0200 Subject: [PATCH 06/12] Do not test with blinker dev version --- .travis-devel-requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis-devel-requirements.txt b/.travis-devel-requirements.txt index c8bd9c45..0379f639 100644 --- a/.travis-devel-requirements.txt +++ b/.travis-devel-requirements.txt @@ -3,4 +3,6 @@ git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2 git+git://github.com/mitsuhiko/itsdangerous.git#egg=itsdangerous # extra dependencies -hg+http://bitbucket.org/jek/blinker#egg=blinker +# Python 3.x support in the development version of blinker is broken, see: +# https://bitbucket.org/jek/blinker/issue/8/python-3-compatiblity-broken-in-tip +# hg+http://bitbucket.org/jek/blinker#egg=blinker From e2fdf28e97695e9bcc4ea962bfcfefee70510e33 Mon Sep 17 00:00:00 2001 From: BobStevens Date: Thu, 27 Jun 2013 16:31:04 -0400 Subject: [PATCH 07/12] word change for clarity changed "200 error code" to "200 status code" --- docs/quickstart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quickstart.rst b/docs/quickstart.rst index b455e070..19242c5d 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -667,7 +667,7 @@ 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 +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 From 9fe209b497ca6f51ffbb0bfc9d0131240067d807 Mon Sep 17 00:00:00 2001 From: BobStevens Date: Thu, 27 Jun 2013 16:32:20 -0400 Subject: [PATCH 08/12] fixed typo --- docs/quickstart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 19242c5d..9d96b00a 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -666,7 +666,7 @@ 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`` +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: From 4028e2395c3b559ca65db13fb1407c79ca79a4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= Date: Sun, 30 Jun 2013 13:17:39 -0300 Subject: [PATCH 09/12] plural --- docs/quickstart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quickstart.rst b/docs/quickstart.rst index b455e070..dbe720dc 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 From 13b828379385d04d191fd7b8ae99b4353f9cfca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Neuha=CC=88user?= Date: Wed, 3 Jul 2013 12:37:43 +0200 Subject: [PATCH 10/12] Test blinker development version again Apparently blinker isn't broken on tip anymore. --- .travis-devel-requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis-devel-requirements.txt b/.travis-devel-requirements.txt index 0379f639..c8bd9c45 100644 --- a/.travis-devel-requirements.txt +++ b/.travis-devel-requirements.txt @@ -3,6 +3,4 @@ git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2 git+git://github.com/mitsuhiko/itsdangerous.git#egg=itsdangerous # extra dependencies -# Python 3.x support in the development version of blinker is broken, see: -# https://bitbucket.org/jek/blinker/issue/8/python-3-compatiblity-broken-in-tip -# hg+http://bitbucket.org/jek/blinker#egg=blinker +hg+http://bitbucket.org/jek/blinker#egg=blinker From f606a6d6a156fe87bb1c9a5f81675d00a225aa65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Neuha=CC=88user?= Date: Fri, 5 Jul 2013 23:18:13 +0200 Subject: [PATCH 11/12] blinker repository moved to github --- .travis-devel-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis-devel-requirements.txt b/.travis-devel-requirements.txt index c8bd9c45..18ee00ec 100644 --- a/.travis-devel-requirements.txt +++ b/.travis-devel-requirements.txt @@ -3,4 +3,4 @@ git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2 git+git://github.com/mitsuhiko/itsdangerous.git#egg=itsdangerous # extra dependencies -hg+http://bitbucket.org/jek/blinker#egg=blinker +git+git://github.com/jek/blinker.git#egg=blinker From f632ba25e0406d2f0e374eb2e4637599a18bff77 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 22 Jul 2013 02:12:17 -0700 Subject: [PATCH 12/12] api.rst: fix some spelling/typos --- docs/api.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 9662187f..75295b1e 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -365,7 +365,7 @@ 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. @@ -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::