maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Allow name to be specified as the first parameter but with an explict name.

Browse source
This commit is contained in:
Armin Ronacher 2011-06-06 10:10:10 +02:00
parent c9cd6084c2
commit b4ffa4d9ac
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/flask-07-upgrade.py
View file

@ -44,7 +44,7 @@ _url_for_re = re.compile(r'\b(url_for\()(%s)' % _string_re_part)
_render_template_re = re.compile(r'\b(render_template\()(%s)' % _string_re_part) _render_template_re = re.compile(r'\b(render_template\()(%s)' % _string_re_part)
_after_request_re = re.compile(r'((?:@\S+\.(?:app_)?))(after_request)(\b\s*$)(?m)') _after_request_re = re.compile(r'((?:@\S+\.(?:app_)?))(after_request)(\b\s*$)(?m)')
_module_constructor_re = re.compile(r'([a-zA-Z0-9_][a-zA-Z0-9_]*)\s*=\s*Module' _module_constructor_re = re.compile(r'([a-zA-Z0-9_][a-zA-Z0-9_]*)\s*=\s*Module'
r'\(__name__\s*(?:,\s*(%s))?' % r'\(__name__\s*(?:,\s*(?:name\s*=\s*)?(%s))?' %
_string_re_part) _string_re_part)
_error_handler_re = re.compile(r'%s\.error_handlers\[\s*(\d+)\s*\]' % _app_re_part) _error_handler_re = re.compile(r'%s\.error_handlers\[\s*(\d+)\s*\]' % _app_re_part)
_mod_route_re = re.compile(r'([a-zA-Z0-9_][a-zA-Z0-9_]*)\.route') _mod_route_re = re.compile(r'([a-zA-Z0-9_][a-zA-Z0-9_]*)\.route')
@ -248,10 +248,13 @@ def upgrade_template_file(filename, contents):
def walk_path(path): def walk_path(path):
this_file = os.path.realpath(__file__).rstrip('c')
for dirpath, dirnames, filenames in os.walk(path): for dirpath, dirnames, filenames in os.walk(path):
dirnames[:] = [x for x in dirnames if not x.startswith('.')] dirnames[:] = [x for x in dirnames if not x.startswith('.')]
for filename in filenames: for filename in filenames:
filename = os.path.join(dirpath, filename) filename = os.path.join(dirpath, filename)
if os.path.realpath(filename) == this_file:
continue
if filename.endswith('.py'): if filename.endswith('.py'):
yield filename, 'python' yield filename, 'python'
# skip files that are diffs. These might be false positives # skip files that are diffs. These might be false positives

1
scripts/testproj/test.py
View file

@ -3,6 +3,7 @@ from flask import Flask, Module
mod = Module(__name__) mod = Module(__name__)
mod2 = Module(__name__, 'testmod2') mod2 = Module(__name__, 'testmod2')
mod3 = Module(__name__, name='somemod', subdomain='meh')
app = Flask(__name__) app = Flask(__name__)
app.register_module(mod) app.register_module(mod)