fixed some very strange issue with htmlfill import - don't know why but this needs to be imported as separate module

--HG--
branch : beta

2 files changed, 5 insertions, 5 deletions

diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py
index c7f73b70..ec7bacad 100644
--- a/rhodecode/controllers/admin/settings.py
+++ b/rhodecode/controllers/admin/settings.py
@@ -48,7 +48,6 @@ from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.settings import SettingsModel
 from rhodecode.model.user import UserModel
-from rhodecode.model.repo import RepoModel
 
 log = logging.getLogger(__name__)
 
diff --git a/rhodecode/controllers/settings.py b/rhodecode/controllers/settings.py
index 2343eea1..359368bb 100644
--- a/rhodecode/controllers/settings.py
+++ b/rhodecode/controllers/settings.py
@@ -27,9 +27,10 @@
 
 import logging
 import traceback
-
 import formencode
 
+from formencode import htmlfill
+
 from pylons import tmpl_context as c, request, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
@@ -89,7 +90,7 @@ class SettingsController(BaseRepoController):
             defaults.update({'g_perm_%s' % p.users_group.users_group_name:
                              p.permission.permission_name})
 
-        return formencode.htmlfill.render(
+        return htmlfill.render(
             render('settings/repo_settings.html'),
             defaults=defaults,
             encoding="UTF-8",
@@ -114,7 +115,7 @@ class SettingsController(BaseRepoController):
             c.repo_info = repo_model.get_by_repo_name(repo_name)
             c.users_array = repo_model.get_users_js()
             errors.value.update({'user':c.repo_info.user.username})
-            return formencode.htmlfill.render(
+            return htmlfill.render(
                 render('settings/repo_settings.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
@@ -199,7 +200,7 @@ class SettingsController(BaseRepoController):
             c.new_repo = errors.value['fork_name']
             r = render('settings/repo_fork.html')
 
-            return formencode.htmlfill.render(
+            return htmlfill.render(
                 r,
                 defaults=errors.value,
                 errors=errors.error_dict or {},