maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity
1626 commits 4 branches 69 tags 36 MiB
Commit graph

1626 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Neuhäuser
1fe20d3208 Merge pull request #744 from ThomasWaldmann/sprint-branch 
2 small fixes for metaclass and import usage
 2013-05-25 11:28:16 -07:00
Thomas Waldmann
96b8ffbb29 always import from ._compat 2013-05-25 20:24:14 +02:00
Thomas Waldmann
83f7658572 fix metaclass usage for py3 2013-05-25 20:19:17 +02:00
Daniel Neuhäuser
3c5d7bab26 Merge pull request #743 from ThomasWaldmann/sprint-branch 
fix iterator in testsuite helpers
 2013-05-25 10:49:25 -07:00
Thomas Waldmann
af5576a6c5 fix iterator in testsuite helpers 2013-05-25 19:46:26 +02:00
Daniel Neuhäuser
da10fb41b7 Merge pull request #741 from Turbo87/patch-1 
Fixed typo in app.blueprints docstring
 2013-05-25 10:36:10 -07:00
Daniel Neuhäuser
ffbcad1e46 Merge pull request #742 from ThomasWaldmann/sprint-branch 
fix minitwit/flaskr test errors, improve docs about file open mode
 2013-05-25 10:35:08 -07:00
Thomas Waldmann
8bb972e5ae fix minitwit/flaskr test errors, improve docs about file open mode 
app.open_resource needs to get called with the correct mode param (python3
will read bytes [not str] if the wrong mode is used), add mode param docs.

rv.data is bytes, fix the data type we compare it with to be also bytes
 2013-05-25 19:13:48 +02:00
Tobias Bieniek
12c08c03fb Fixed typo in app.blueprints docstring 2013-05-25 09:10:41 +03:00
Armin Ronacher
250247d96c Added install section 2013-05-23 14:17:51 +01:00
Armin Ronacher
df5890ad71 Change travis test command 2013-05-23 14:15:27 +01:00
Armin Ronacher
22816b1d3d Removed 2.5 support in master 2013-05-23 14:09:22 +01:00
Armin Ronacher
85ba8c96e9 Fixed a broken test 2013-05-23 14:07:25 +01:00
Armin Ronacher
16df96c552 Merge branch 'master' into sprint-branch 2013-05-23 14:01:33 +01:00
Armin Ronacher
4c27f7a8c4 Removed incorrect JSON exception subclasses 2013-05-23 13:59:10 +01:00
Armin Ronacher
eb023bcfad Support old and new name for json 2013-05-23 13:46:51 +01:00
Daniel Neuhäuser
79ec3d81c1 Prevent UnboundLocalError in test_build_error_handler 2013-05-22 22:58:12 +02:00
Daniel Neuhäuser
43b6d0a6d0 Ensure that config file is closed immediately 2013-05-22 22:49:25 +02:00
Daniel Neuhäuser
a0801719f8 Remove six dependency 2013-05-22 21:40:30 +02:00
Daniel Neuhäuser
135c53a5f2 Fix .iteritems() access in flask.sessions 2013-05-22 21:30:45 +02:00
Daniel Neuhäuser
d395d3684a Merge pull request #739 from untitaker/sprint-branch 
Fix leak in leak detection code
 2013-05-22 12:16:25 -07:00
Markus Unterwaditzer
3d36d6efb9 Fix leak in leak detection code 
If ensure_clean_request_context found a leak, it would raise an
AssertionError and not clean up the leak, and therefore affect other
testcases.
 2013-05-22 21:09:32 +02:00
Daniel Neuhäuser
4bea6bbe6d Make DebugFilesKeyError.__str__ return str on 3.x 2013-05-22 21:07:53 +02:00
Daniel Neuhäuser
3f80b0fd6c module name is quoted in ImportErrors on 3.x 2013-05-22 21:03:01 +02:00
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
Armin Ronacher
aecc41deb8 Restore 2.5 support for the time being 2013-05-20 09:47:07 +01:00
Armin Ronacher
81c9b3570b Removed 2.5 from travis 2013-05-20 09:44:05 +01: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