Commit graph

1450 commits

Author SHA1 Message Date
Daniel Neuhäuser
8f73c552a9 Add missing assertIn, assertNotIn methods on 2.6 2013-05-22 20:53:32 +02:00
Daniel Neuhäuser
62e7275bdf Use assert_false where appropriate 2013-05-22 20:17:29 +02:00
Daniel Neuhäuser
9f8a2075c7 Use assert_in where appropriate 2013-05-22 20:12:50 +02:00
Daniel Neuhäuser
4d73ef1a19 Add missing msg argument to assert_true() 2013-05-22 19:19:46 +02:00
Daniel Neuhäuser
8e9f0bdedc Use assert_equal instead of assertEquals
assertEquals is deprecated and its use inconsistent
2013-05-22 17:30:37 +02:00
Daniel Neuhäuser
239780be28 Use assert_true instead of assert_
assert_ is deprecated which causes annoying warnings
2013-05-22 17:23:38 +02:00
Daniel Neuhäuser
5b89355b1c Response data is bytes 2013-05-22 17:14:07 +02:00
Daniel Neuhäuser
97815b999e Merge pull request #737 from untitaker/sprint-branch
Fix some literals
2013-05-22 08:11:46 -07:00
Markus Unterwaditzer
05f66ad735 Fix some literals 2013-05-22 17:09:37 +02:00
Daniel Neuhäuser
3f51a09db4 itsdangerous uses json instead of simplejson now 2013-05-22 16:33:50 +02:00
Daniel Neuhäuser
884aad8ece Test using itsdangerous with 3.x support 2013-05-22 16:33:05 +02:00
Daniel Neuhäuser
ee013e01b0 Merge pull request #736 from ThomasWaldmann/sprint-branch
some more work on py 3.3 port
2013-05-22 07:20:41 -07:00
Daniel Neuhäuser
da5edad23a Use werkzeug@sprint-branch in tox 2013-05-22 16:19:57 +02:00
Thomas Waldmann
e1d356fb71 ported some more stuff to py 3.3
removed init_jinja_globals hack from app.py after consulting mitsuhiko
(didn't work on py 3.3 "as is")

removed with_statement future imports, not needed any more

needs more work on 2.7 as well as on 3.3
2013-05-22 01:33:04 +02:00
Thomas Waldmann
a503520ac5 copy _compat.py from flask in here (and adapt docstring) 2013-05-21 23:34:25 +02:00
Daniel Neuhäuser
ceb7c7f771 Don't notify IRC for this branch 2013-05-18 19:05:10 +02:00
Daniel Neuhäuser
506db0eab2 Use print_function 2013-05-18 19:00:06 +02:00
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
Daniel Neuhäuser
aba1d3a507 Test on 3.3 on travis 2013-05-18 18:28:59 +02:00
Daniel Neuhäuser
323a840c5a Add tox.ini 2013-05-18 18:27:49 +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
Daniel Neuhäuser
c87735ff1b Merge pull request #731 from ThomasWaldmann/docs
document python 2.6 minimum requirement, remove stuff that refers to 2.5
2013-05-18 08:18:05 -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
521398d5e7 Added missing newlines to readme 2013-05-14 14:06:11 +01:00
Armin Ronacher
b89af66346 Revert "update README to markdown"
This reverts commit fb6dee3639.
2013-05-14 14:05:34 +01:00
Armin Ronacher
1c2dddb355 Merge branch 'master' of github.com:mitsuhiko/flask 2013-05-14 11:51:46 +01:00
Armin Ronacher
574a97cd70 Disabled memory tests by default 2013-05-14 11:51:38 +01:00
Armin Ronacher
7265bb7fa0 Merge pull request #676 from lambdadi/master
Database improperly closed in the test case within this tutorial
2013-05-14 03:49:50 -07: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
38eed272f9 Merge branch 'master' of github.com:mitsuhiko/flask 2013-05-14 11:33:18 +01:00
Armin Ronacher
2ba37d2b85 Fixed some rst markup problems 2013-05-14 11:33:13 +01:00
Armin Ronacher
ef62e8440e Merge pull request #702 from edburnett/master
AJAX with jQuery documentation update
2013-05-14 03:25:49 -07:00
Armin Ronacher
6a8acc115e Merge pull request #709 from halexus/patch-1
Update README of example Flaskr
2013-05-14 03:25:33 -07:00
Armin Ronacher
833198c91b Added a missing comma 2013-05-14 11:23:31 +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