Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:mitsuhiko/flask

  • Loading branch information...
commit 81b4271fa67f160dfde210ed011c219f4b065594 2 parents 2b8ea40 + 90884a7
Armin Ronacher authored
Showing with 13 additions and 14 deletions.
  1. +5 −3 flask/app.py
  2. +1 −1  flask/views.py
  3. +7 −10 setup.py
8 flask/app.py
View
@@ -657,7 +657,7 @@ def update_template_context(self, context):
# existing views.
context.update(orig_ctx)
- def run(self, host='127.0.0.1', port=5000, **options):
+ def run(self, host='127.0.0.1', port=5000, debug=None, **options):
"""Runs the application on a local development server. If the
:attr:`debug` flag is set the server will automatically reload
for code changes and show a debugger in case an exception happened.
@@ -680,14 +680,16 @@ def run(self, host='127.0.0.1', port=5000, **options):
:param host: the hostname to listen on. set this to ``'0.0.0.0'``
to have the server available externally as well.
:param port: the port of the webserver
+ :param debug: if given, enable or disable debug mode.
+ See :attr:`debug`.
:param options: the options to be forwarded to the underlying
Werkzeug server. See
:func:`werkzeug.serving.run_simple` for more
information.
"""
from werkzeug.serving import run_simple
- if 'debug' in options:
- self.debug = options.pop('debug')
+ if debug is not None:
+ self.debug = bool(debug)
options.setdefault('use_reloader', self.debug)
options.setdefault('use_debugger', self.debug)
try:
2  flask/views.py
View
@@ -64,7 +64,7 @@ def dispatch_request(self):
def dispatch_request(self):
"""Subclasses have to override this method to implement the
- actual view functionc ode. This method is called with all
+ actual view function code. This method is called with all
the arguments from the URL rule.
"""
raise NotImplementedError()
17 setup.py
View
@@ -49,7 +49,7 @@ class run_audit(Command):
user_options = []
def initialize_options(self):
- all = None
+ pass
def finalize_options(self):
pass
@@ -62,22 +62,19 @@ def run(self):
print "Audit requires PyFlakes installed in your system."""
sys.exit(-1)
- dirs = ['flask', 'tests']
- # Add example directories
- for dir in ['flaskr', 'jqueryexample', 'minitwit']:
- dirs.append(os.path.join('examples', dir))
- # TODO: Add test subdirectories
warns = 0
+ # Define top-level directories
+ dirs = ('flask', 'examples', 'scripts')
for dir in dirs:
- for filename in os.listdir(dir):
- if filename.endswith('.py') and filename != '__init__.py':
- warns += flakes.checkPath(os.path.join(dir, filename))
+ for root, _, files in os.walk(dir):
+ for file in files:
+ if file != '__init__.py' and file.endswith('.py') :
+ warns += flakes.checkPath(os.path.join(root, file))
if warns > 0:
print ("Audit finished with total %d warnings." % warns)
else:
print ("No problems found in sourcecode.")
-
setup(
name='Flask',
version='0.8-dev',
Please sign in to comment.
Something went wrong with that request. Please try again.