mirror of
1
0
Fork 0
Browse Source

Merge pull request #747 from ThomasWaldmann/sprint-branch

replace 1/0 by 1 // 0 to get rid of DeprecationWarning (and PEP8 issue)
pull/751/head
Daniel Neuhäuser 12 years ago
parent
commit
915d7180fc
  1. 6
      flask/testsuite/basic.py
  2. 10
      flask/testsuite/helpers.py
  3. 2
      flask/testsuite/signals.py
  4. 2
      flask/testsuite/subclassing.py
  5. 2
      flask/testsuite/testing.py
  6. 4
      flask/testsuite/views.py

6
flask/testsuite/basic.py

@ -529,7 +529,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
pass
@app.route('/')
def fails():
1/0
1 // 0
rv = app.test_client().get('/')
self.assert_equal(rv.status_code, 500)
self.assert_in(b'Internal Server Error', rv.data)
@ -866,7 +866,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
app = flask.Flask(__name__)
@app.route('/')
def index():
1/0
1 // 0
c = app.test_client()
if config_key is not None:
app.config[config_key] = True
@ -1054,7 +1054,7 @@ class BasicFunctionalityTestCase(FlaskTestCase):
@app.route('/fail')
def fail_func():
1/0
1 // 0
c = app.test_client()
for x in range(3):

10
flask/testsuite/helpers.py

@ -306,7 +306,7 @@ class LoggingTestCase(FlaskTestCase):
@app.route('/exc')
def exc():
1/0
1 // 0
with app.test_client() as c:
with catch_stderr() as err:
@ -340,7 +340,7 @@ class LoggingTestCase(FlaskTestCase):
@app.route('/')
def index():
1/0
1 // 0
rv = app.test_client().get('/')
self.assert_equal(rv.status_code, 500)
@ -349,7 +349,7 @@ class LoggingTestCase(FlaskTestCase):
err = out.getvalue()
self.assert_in('Exception on / [GET]', err)
self.assert_in('Traceback (most recent call last):', err)
self.assert_in('1/0', err)
self.assert_in('1 // 0', err)
self.assert_in('ZeroDivisionError:', err)
def test_processor_exceptions(self):
@ -357,11 +357,11 @@ class LoggingTestCase(FlaskTestCase):
@app.before_request
def before_request():
if trigger == 'before':
1/0
1 // 0
@app.after_request
def after_request(response):
if trigger == 'after':
1/0
1 // 0
return response
@app.route('/')
def index():

2
flask/testsuite/signals.py

@ -83,7 +83,7 @@ class SignalsTestCase(FlaskTestCase):
@app.route('/')
def index():
1/0
1 // 0
def record(sender, exception):
recorded.append(exception)

2
flask/testsuite/subclassing.py

@ -30,7 +30,7 @@ class FlaskSubclassingTestCase(FlaskTestCase):
@app.route('/')
def index():
1/0
1 // 0
rv = app.test_client().get('/')
self.assert_equal(rv.status_code, 500)

2
flask/testsuite/testing.py

@ -143,7 +143,7 @@ class TestToolsTestCase(FlaskTestCase):
@app.route('/other')
def other():
1/0
1 // 0
with app.test_client() as c:
resp = c.get('/')

4
flask/testsuite/views.py

@ -55,9 +55,9 @@ class ViewTestCase(FlaskTestCase):
class Index(flask.views.MethodView):
def get(self):
1/0
1 // 0
def post(self):
1/0
1 // 0
class Other(Index):
def get(self):

Loading…
Cancel
Save