old updates that needed merge

Author: jstacoder

flask_xxl/main.py

@@ -47,7 +47,7 @@ def get_app(self, app_module_name, **kwargs):
 
         self._set_path()
         self._bind_extensions()
-        self._register_blueprints()
+        #self._register_blueprints()
         self._register_routes()
         self._register_context_processors()
         self._register_template_filters()
@@ -66,8 +66,9 @@ def _get_imported_stuff_by_path(self, path):
 
     def _register_template_extensions(self):
         self.app.jinja_options = dict(Flask.jinja_options)
+        exts = self.app.config.get('TEMPLATE_EXTENSIONS') or ['jinja2_highlight.HighlightExtension']
         self.app.jinja_options.setdefault('extensions',[])\
-                                .append('jinja2_highlight.HighlightExtension')
+                                .extend(exts)
 
     def _bind_extensions(self):
         if self.app.config.get('VERBOSE',False):

flask_xxl/manage.py

@@ -7,7 +7,7 @@
 """
 import subprocess
 from flask.ext.script import Shell, Manager, prompt_bool
-from flask.ext.script.commands import Clean
+from flask.ext.script.commands import Clean,ShowUrls
 from flask.ext.xxl import flaskxxl
 manager = Manager(flaskxxl)
 from flask.ext.xxl.mr_bob import manager as mrbob_manager
@@ -19,6 +19,7 @@ def main(auto=False):
     flaskxxl.test_request_context().push() 
     manager.add_command('mrbob',mrbob_manager)
     manager.add_command('clean',Clean())
+    manager.add_command('urls',ShowUrls())
     default_cmd = 'mrbob'
     if len(sys.argv) > 2:
         default_cmd = 'clean'

manage.py

@@ -7,7 +7,7 @@
 """
 import subprocess
 from flask.ext.script import Shell, Manager, prompt_bool
-from flask.ext.script.commands import Clean
+from flask.ext.script.commands import Clean,ShowUrls
 from flask.ext.xxl import flaskxxl
 manager = Manager(flaskxxl)
 from flask.ext.xxl.mr_bob import manager as mrbob_manager
@@ -16,6 +16,7 @@ def main():
     flaskxxl.test_request_context().push() 
     manager.add_command('mrbob',mrbob_manager)
     manager.add_command('clean',Clean())
+    manager.add_command('urls',ShowUrls())
     manager.run(default_command='mrbob')
 
 if __name__ == '__main__':