diff options
| -rw-r--r-- | mediagoblin/app.py | 3 | ||||
| -rw-r--r-- | mediagoblin/init/__init__.py | 18 | ||||
| -rw-r--r-- | mediagoblin/util.py | 16 |
3 files changed, 20 insertions, 17 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 080c8e3a..2450831a 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -26,6 +26,7 @@ from mediagoblin.config import ( from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.mg_globals import setup_globals from mediagoblin.init.celery import setup_celery_from_config +from mediagoblin.init import get_jinja_loader from mediagoblin.workbench import WorkbenchManager @@ -71,7 +72,7 @@ class MediaGoblinApp(object): app_config) # Get the template environment - self.template_loader = util.get_jinja_loader( + self.template_loader = get_jinja_loader( app_config.get('user_template_path')) # Set up storage systems diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index c129cbf8..b8ed2456 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -13,3 +13,21 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. + +import jinja2 + + +def get_jinja_loader(user_template_path=None): + """ + Set up the Jinja template loaders, possibly allowing for user + overridden templates. + + (In the future we may have another system for providing theming; + for now this is good enough.) + """ + if user_template_path: + return jinja2.ChoiceLoader( + [jinja2.FileSystemLoader(user_template_path), + jinja2.PackageLoader('mediagoblin', 'templates')]) + else: + return jinja2.PackageLoader('mediagoblin', 'templates') diff --git a/mediagoblin/util.py b/mediagoblin/util.py index a20e87c4..ab219df0 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -64,22 +64,6 @@ def clear_test_buckets(): clear_test_template_context() -def get_jinja_loader(user_template_path=None): - """ - Set up the Jinja template loaders, possibly allowing for user - overridden templates. - - (In the future we may have another system for providing theming; - for now this is good enough.) - """ - if user_template_path: - return jinja2.ChoiceLoader( - [jinja2.FileSystemLoader(user_template_path), - jinja2.PackageLoader('mediagoblin', 'templates')]) - else: - return jinja2.PackageLoader('mediagoblin', 'templates') - - SETUP_JINJA_ENVS = {} |