ravi-patel/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six

Browse source 
Conflicts:
	flask/testsuite/__init__.py
This commit is contained in:
Daniel Neuhäuser 2013-05-18 18:54:45 +02:00
commit 8494574fdf
13 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flask/testsuite/__init__.py
View file

@ -10,6 +10,7 @@
:license: BSD, see LICENSE for more details.
"""
from __future__ import print_function
from __future__ import with_statement
import os
@ -221,4 +222,4 @@ def main():
try:
unittest.main(testLoader=BetterLoader(), defaultTest='suite')
except Exception as e:
print 'Error: %s' % e
print('Error: %s' % e)