Commit graph

446 commits

Author SHA1 Message Date
Daniel Neuhäuser
c618db92d6 reload_module is in six.moves 2013-05-18 18:55:36 +02:00
Daniel Neuhäuser
8494574fdf Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six
Conflicts:
	flask/testsuite/__init__.py
2013-05-18 18:54:45 +02:00
Thomas Waldmann
287905e67c py3 compat: use six.reload_module 2013-05-18 18:39:10 +02:00
Thomas Waldmann
522cd00093 python-modernize automated changes: fix_unicode (but without six.u()) 2013-05-18 18:12:30 +02:00
Thomas Waldmann
dcd052366b python-modernize automated changes: fix_next 2013-05-18 18:03:37 +02:00
Thomas Waldmann
0f8c47c988 python-modernize automated changes: fix_dict 2013-05-18 18:00:15 +02:00
Thomas Waldmann
cfbfff2d26 python-modernize automated changes: misc. minor stuff 2013-05-18 17:57:43 +02:00
Thomas Waldmann
1b753cb1b1 require 'six' in setup.py, add flask._compat for stuff not yet in 'six' 2013-05-18 17:47:40 +02:00
Daniel Neuhäuser
05923f7f2f Merge branch 'exec' of github.com:ThomasWaldmann/flask into sprint-branch
Conflicts:
	flask/config.py
2013-05-18 17:32:38 +02:00
Daniel Neuhäuser
26a9e90734 Merge pull request #734 from ThomasWaldmann/methodattrs
automated change using python-modernize: fix methodattrs
2013-05-18 08:24:45 -07:00
Daniel Neuhäuser
bbdfc83902 Merge pull request #732 from ThomasWaldmann/exceptions_as
automated change using python-modernize: use 'as' in except
2013-05-18 08:24:00 -07:00
Thomas Waldmann
40fad2ece8 document python 2.6 minimum requirement, remove all stuff that refers to 2.5 2013-05-18 17:06:25 +02:00
Thomas Waldmann
b8b769ad41 automated change using python-modernize: fix methodattrs 2013-05-18 16:39:39 +02:00
Thomas Waldmann
b52b7b1f93 automated change using python-modernize: replace execfile 2013-05-18 16:31:40 +02:00
Thomas Waldmann
6caaa8a527 automated change using python-modernize: use 'as' in except 2013-05-18 16:24:40 +02:00
Armin Ronacher
574a97cd70 Disabled memory tests by default 2013-05-14 11:51:38 +01:00
Armin Ronacher
335e0af731 Merge pull request #708 from xealot/master
Blueprint.after_request causes Flask to ignore @after_this_request
2013-05-14 03:36:29 -07:00
Armin Ronacher
c349c91aff Added support for UUID objects to JSON serializer as well 2013-05-14 11:35:45 +01:00
Armin Ronacher
18673ba370 Added uuid support for new session serialization and documented it 2013-05-14 11:33:36 +01:00
Armin Ronacher
2ba37d2b85 Fixed some rst markup problems 2013-05-14 11:33:13 +01:00
Armin Ronacher
30d9efb24a Merge branch 'master' of github.com:mitsuhiko/flask 2013-05-14 11:00:45 +01:00
Armin Ronacher
097353695e Added flask.copy_current_request_context which simplies working with greenlets 2013-05-14 11:00:04 +01:00
Trey Long
f74f446961 fixing process_response
Flask.process_response will throw away functions is receives from ctx._after_request_functions if there is a Blueprint that has used @after_request.
2013-04-04 12:31:42 -03:00
Tomasz Kalkosiński
78ae0ec7f8 Add import to jsonify example. 2013-03-25 12:29:28 +01:00
Paulo Poiati
b2aae044ca Flash messages signals
If we send a signal when a template is rendered why not when a message
is flashed? One real world use case is in tests, this signal should make
flash messages expectation easier to implement.
2013-02-28 01:19:52 -03:00
Armin Ronacher
bfeee75696 Changed session cookie defaults to work better with google chrome 2013-01-29 19:31:45 +00:00
Armin Ronacher
6bd0080575 Added workaround for Chrome cookies 2013-01-28 15:08:54 +00:00
Armin Ronacher
6ab569b0e3 Added note on teardown in debug mode. Fixes #661 2013-01-27 00:56:01 +00:00
Armin Ronacher
3b393f89f6 Added template_global, fixes #657 2013-01-27 00:46:19 +00:00
Kenneth Reitz
777c0c56b5 Merge pull request #630 from untitaker/doc_fix_appctx
Fix #623
2013-01-24 20:13:30 -08:00
Max Countryman
b5069d07a2 adding _scheme parameter to url_for
In order to better facilitate generation of URLs that make use of an HTTPS URL
scheme this patch adds a parameter with this specific purpose in mind. To
achieve this we explicitly pass in a param, `_scheme='https'`, and then set the
`url_scheme` attribute of our `MapAdapter` instance appropriately.

Importantly, `_external=True` must be set in order for this to work properly.
As such, failure to do so results in a `ValueError` being raised.
2013-01-21 16:18:46 -08:00
Armin Ronacher
61d3bbf1d2 Fixed last commit and added test 2013-01-21 17:55:07 +00:00
Armin Ronacher
f1537a9d7a Always trap proxy exceptions 2013-01-21 17:44:32 +00:00
Markus Unterwaditzer
2b30900e2c Fix #623 2013-01-11 16:52:38 +01:00
Armin Ronacher
2af0ffaef6 Added proxies to template context 2012-12-21 11:47:27 +01:00
Armin Ronacher
1949c4a9ab flask.g is now on the app context and not the request context 2012-12-21 11:45:42 +01:00
Armin Ronacher
2b885ce4dc Added better error reporting for unicode errors in sessions 2012-10-30 14:47:17 +00:00
Armin Ronacher
8339cb3508 Added support for unicode json dumping. This fixes #535 2012-10-18 00:48:15 +01:00
Mitchell Peabody
275f830c83 There was a duplicated call to url_adapter.build(...)
try:
        rv = url_adapter.build(endpoint, values, method=method,
                               force_external=external)
    except BuildError, error:
        # We need to inject the values again so that the app callback can
        # deal with that sort of stuff.
        values['_external'] = external
        values['_anchor'] = anchor
        values['_method'] = method
        return appctx.app.handle_url_build_error(error, endpoint, values)

   rv = url_adapter.build(endpoint, values, method=method,
                          force_external=external)

If no exception was raised for url_adapter.build(...) then the same method call
would be made after the try...except block. This is unnecessary.
2012-10-17 11:56:39 -04:00
Mitchell Peabody
a15c6c569a The builder on github is using python 2.5, the views.py testsuite uses the with
statement, and thus flask/testsuite/views.py requires

from __future__ import with_statement

at the beginning.
2012-10-16 16:57:57 -04:00
Armin Ronacher
3e9f4e254b Updated a comment that was misleading with recent flask sqlalchemy installations 2012-10-08 07:05:32 +02:00
Armin Ronacher
f34c028125 Added template tests and made config a true global 2012-10-08 07:01:49 +02:00
Armin Ronacher
5e88c8184d Removed deprecated and awkward flask.session module 2012-10-08 06:48:13 +02:00
Armin Ronacher
05c6502cbd Let json.* work even without app on the stack and added tests 2012-10-07 23:41:41 +02:00
Armin Ronacher
b146d8277a Added wrapper module around simplejson/json for much simplified customization. 2012-10-07 23:31:48 +02:00
Armin Ronacher
301e244df3 Consistent use of encoding naming 2012-10-07 22:59:52 +02:00
Armin Ronacher
3afcbf160e Extra safety for safe_join. Does not look exploitable but better safe than sorry. Fixes #501 2012-10-07 22:58:41 +02:00
Armin Ronacher
661ee54bc2 Raise exceptions if a function is overridden by a new endpoint. This fixes #570 2012-10-07 17:12:16 +02:00
Armin Ronacher
f8b6033a3b Added a workaround for samefile. This fixes #600 2012-10-07 16:04:31 +02:00
Armin Ronacher
c4f2075f4c tojson no longer escapes script blocks in HTML5 parsers. Fixed #605 2012-10-07 15:33:25 +02:00