Permalink
Browse files

Always register URL rules. This fixes #81

  • Loading branch information...
1 parent 6e52355 commit ed16ae2183ad44a7ba89aedd331a180455ed0836 @mitsuhiko mitsuhiko committed Jul 13, 2010
Showing with 13 additions and 8 deletions.
  1. +4 −0 CHANGES
  2. +8 −5 flask/app.py
  3. +1 −3 flask/helpers.py
View
4 CHANGES
@@ -13,6 +13,10 @@ Release date to be announced, codename to be decided.
- OPTIONS is now automatically implemented by Flask unless the
application explictly adds 'OPTIONS' as method to the URL rule.
In this case no automatic OPTIONS handling kicks in.
+- static rules are now even in place if there is no static folder
+ for the module. This was implemented to aid GAE which will
+ remove the static folder if it's part of a mapping in the .yml
+ file.
Version 0.5.1
-------------
View
13 flask/app.py
@@ -271,11 +271,14 @@ def __init__(self, import_name, static_path=None):
#: app.url_map.converters['list'] = ListConverter
self.url_map = Map()
- # if there is a static folder, register it for the application.
- if self.has_static_folder:
- self.add_url_rule(self.static_path + '/<path:filename>',
- endpoint='static',
- view_func=self.send_static_file)
+ # register the static folder for the application. Do that even
+ # if the folder does not exist. First of all it might be created
+ # while the server is running (usually happens during development)
+ # but also because google appengine stores static files somewhere
+ # else when mapped with the .yml file.
+ self.add_url_rule(self.static_path + '/<path:filename>',
+ endpoint='static',
+ view_func=self.send_static_file)
#: The Jinja2 environment. It is created from the
#: :attr:`jinja_options`.
View
4 flask/helpers.py
@@ -366,9 +366,7 @@ def jinja_loader(self):
.. versionadded:: 0.5
"""
- template_folder = os.path.join(self.root_path, 'templates')
- if os.path.isdir(template_folder):
- return FileSystemLoader(template_folder)
+ return FileSystemLoader(os.path.join(self.root_path, 'templates'))
def send_static_file(self, filename):
"""Function used internally to send static files from the static

0 comments on commit ed16ae2

Please sign in to comment.