Browse Source

Various pyflakes fixes

pull/112/head
Armin Ronacher 15 years ago
parent
commit
c9002569c9
  1. 5
      Makefile
  2. 23
      tests/flask_tests.py
  3. 1
      tests/flaskext_test.py

5
Makefile

@ -1,10 +1,13 @@
.PHONY: clean-pyc ext-test test upload-docs docs .PHONY: clean-pyc ext-test test upload-docs docs audit
all: clean-pyc test all: clean-pyc test
test: test:
python setup.py test python setup.py test
audit:
python setup.py audit
tox-test: tox-test:
PYTHONDONTWRITEBYTECODE= tox PYTHONDONTWRITEBYTECODE= tox

23
tests/flask_tests.py

@ -15,11 +15,10 @@ import re
import sys import sys
import flask import flask
import unittest import unittest
import tempfile
from logging import StreamHandler from logging import StreamHandler
from contextlib import contextmanager from contextlib import contextmanager
from datetime import datetime from datetime import datetime
from werkzeug import parse_date, parse_options_header, http_date from werkzeug import parse_date, parse_options_header
from werkzeug.exceptions import NotFound from werkzeug.exceptions import NotFound
from jinja2 import TemplateNotFound from jinja2 import TemplateNotFound
from cStringIO import StringIO from cStringIO import StringIO
@ -352,7 +351,7 @@ class BasicFunctionalityTestCase(unittest.TestCase):
called.append(4) called.append(4)
return response return response
@app.after_request @app.after_request
def after1(response): def after2(response):
called.append(3) called.append(3)
return response return response
@app.route('/') @app.route('/')
@ -638,13 +637,13 @@ class ModuleTestCase(unittest.TestCase):
app = flask.Flask(__name__) app = flask.Flask(__name__)
admin = flask.Module(__name__, 'admin', url_prefix='/admin') admin = flask.Module(__name__, 'admin', url_prefix='/admin')
@admin.route('/') @admin.route('/')
def index(): def admin_index():
return 'admin index' return 'admin index'
@admin.route('/login') @admin.route('/login')
def login(): def admin_login():
return 'admin login' return 'admin login'
@admin.route('/logout') @admin.route('/logout')
def logout(): def admin_logout():
return 'admin logout' return 'admin logout'
@app.route('/') @app.route('/')
def index(): def index():
@ -680,7 +679,7 @@ class ModuleTestCase(unittest.TestCase):
catched.append('after-admin') catched.append('after-admin')
return response return response
@admin.route('/') @admin.route('/')
def index(): def admin_index():
return 'the admin' return 'the admin'
@app.before_request @app.before_request
def before_request(): def before_request():
@ -719,7 +718,7 @@ class ModuleTestCase(unittest.TestCase):
def index(): def index():
return flask.render_template_string('{{ a }}{{ b }}{{ c }}') return flask.render_template_string('{{ a }}{{ b }}{{ c }}')
@admin.route('/') @admin.route('/')
def index(): def admin_index():
return flask.render_template_string('{{ a }}{{ b }}{{ c }}') return flask.render_template_string('{{ a }}{{ b }}{{ c }}')
app.register_module(admin) app.register_module(admin)
c = app.test_client() c = app.test_client()
@ -794,13 +793,13 @@ class ModuleTestCase(unittest.TestCase):
f = app.view_functions['admin.static'] f = app.view_functions['admin.static']
try: try:
rv = f('/etc/passwd') f('/etc/passwd')
except NotFound: except NotFound:
pass pass
else: else:
assert 0, 'expected exception' assert 0, 'expected exception'
try: try:
rv = f('../__init__.py') f('../__init__.py')
except NotFound: except NotFound:
pass pass
else: else:
@ -914,7 +913,7 @@ class LoggingTestCase(unittest.TestCase):
c = app.test_client() c = app.test_client()
with catch_stderr() as err: with catch_stderr() as err:
rv = c.get('/') c.get('/')
out = err.getvalue() out = err.getvalue()
assert 'WARNING in flask_tests [' in out assert 'WARNING in flask_tests [' in out
assert 'flask_tests.py' in out assert 'flask_tests.py' in out
@ -1098,7 +1097,7 @@ class TestSignals(unittest.TestCase):
flask.template_rendered.connect(record, app) flask.template_rendered.connect(record, app)
try: try:
rv = app.test_client().get('/') app.test_client().get('/')
assert len(recorded) == 1 assert len(recorded) == 1
template, context = recorded[0] template, context = recorded[0]
assert template.name == 'simple_template.html' assert template.name == 'simple_template.html'

1
tests/flaskext_test.py

@ -18,7 +18,6 @@ import urllib2
import tempfile import tempfile
import subprocess import subprocess
import argparse import argparse
from cStringIO import StringIO
from flask import json from flask import json

Loading…
Cancel
Save