From: Joar Wandborg <git@wandborg.com>
Date: Wed, 15 Jun 2011 20:18:24 +0000 (+0200)
Subject: Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9e883ed3b223311e3325e41e75dec7ee82875ac2;p=mediagoblin.git

Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin
---

9e883ed3b223311e3325e41e75dec7ee82875ac2
diff --cc mediagoblin/util.py
index 1e8fa095,fc380f41..eb131830
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@@ -30,10 -30,12 +30,11 @@@ import jinja
  import translitcodec
  from paste.deploy.loadwsgi import NicerConfigParser
  from webob import Response, exc
+ from lxml.html.clean import Cleaner
  
- from mediagoblin import globals as mgoblin_globals
+ from mediagoblin import mg_globals
  from mediagoblin.db.util import ObjectId
  
 -
  TESTS_ENABLED = False
  def _activate_testing():
      """
@@@ -98,11 -100,11 +99,11 @@@ def get_jinja_env(template_loader, loca
  
      template_env = jinja2.Environment(
          loader=template_loader, autoescape=True,
 -        extensions=['jinja2.ext.i18n'])
 +        extensions=['jinja2.ext.i18n', 'jinja2.ext.autoescape'])
  
      template_env.install_gettext_callables(
-         mgoblin_globals.translations.gettext,
-         mgoblin_globals.translations.ngettext)
+         mg_globals.translations.gettext,
+         mg_globals.translations.ngettext)
  
      if exists(locale):
          SETUP_JINJA_ENVS[locale] = template_env