Mercurial > kallithea
changeset 8693:b9b53e25a08d
lib: fix bad references to utils3
A problem introduced in when rebasing 5e46f73f0d1c after renaming the temporary
utils3 name to webutils.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 19 Oct 2020 12:18:28 +0200 |
parents | 64cc63e186e6 |
children | aed6e9a762f3 |
files | kallithea/controllers/admin/auth_settings.py kallithea/controllers/admin/defaults.py kallithea/controllers/admin/my_account.py kallithea/controllers/admin/permissions.py kallithea/controllers/admin/repo_groups.py kallithea/controllers/admin/user_groups.py kallithea/controllers/admin/users.py kallithea/controllers/compare.py kallithea/controllers/forks.py kallithea/controllers/login.py |
diffstat | 10 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/auth_settings.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/admin/auth_settings.py Mon Oct 19 12:18:28 2020 +0200 @@ -36,7 +36,7 @@ from kallithea.lib import helpers as h from kallithea.lib.auth import HasPermissionAnyDecorator, LoginRequired from kallithea.lib.base import BaseController, render -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db, meta from kallithea.model.forms import AuthSettingsForm
--- a/kallithea/controllers/admin/defaults.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/admin/defaults.py Mon Oct 19 12:18:28 2020 +0200 @@ -37,7 +37,7 @@ from kallithea.lib import helpers as h from kallithea.lib.auth import HasPermissionAnyDecorator, LoginRequired from kallithea.lib.base import BaseController, render -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db, meta from kallithea.model.forms import DefaultsForm
--- a/kallithea/controllers/admin/my_account.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/admin/my_account.py Mon Oct 19 12:18:28 2020 +0200 @@ -40,7 +40,7 @@ from kallithea.lib.auth import AuthUser, LoginRequired from kallithea.lib.base import BaseController, IfSshEnabled, render from kallithea.lib.utils2 import generate_api_key, safe_int -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db, meta from kallithea.model.api_key import ApiKeyModel from kallithea.model.forms import PasswordChangeForm, UserForm
--- a/kallithea/controllers/admin/permissions.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/admin/permissions.py Mon Oct 19 12:18:28 2020 +0200 @@ -39,7 +39,7 @@ from kallithea.lib import helpers as h from kallithea.lib.auth import AuthUser, HasPermissionAnyDecorator, LoginRequired from kallithea.lib.base import BaseController, render -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db, meta from kallithea.model.forms import DefaultPermissionsForm from kallithea.model.permission import PermissionModel
--- a/kallithea/controllers/admin/repo_groups.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/admin/repo_groups.py Mon Oct 19 12:18:28 2020 +0200 @@ -40,7 +40,7 @@ from kallithea.lib.auth import HasPermissionAny, HasRepoGroupPermissionLevel, HasRepoGroupPermissionLevelDecorator, LoginRequired from kallithea.lib.base import BaseController, render from kallithea.lib.utils2 import safe_int -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db, meta from kallithea.model.forms import RepoGroupForm, RepoGroupPermsForm from kallithea.model.repo import RepoModel
--- a/kallithea/controllers/admin/user_groups.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/admin/user_groups.py Mon Oct 19 12:18:28 2020 +0200 @@ -43,7 +43,7 @@ from kallithea.lib.exceptions import RepoGroupAssignmentError, UserGroupsAssignedException from kallithea.lib.utils import action_logger from kallithea.lib.utils2 import safe_int, safe_str -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db, meta from kallithea.model.forms import CustomDefaultPermissionsForm, UserGroupForm, UserGroupPermsForm from kallithea.model.scm import UserGroupList
--- a/kallithea/controllers/admin/users.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/admin/users.py Mon Oct 19 12:18:28 2020 +0200 @@ -44,7 +44,7 @@ from kallithea.lib.exceptions import DefaultUserException, UserCreationError, UserOwnsReposException from kallithea.lib.utils import action_logger from kallithea.lib.utils2 import datetime_to_time, generate_api_key, safe_int -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db, meta from kallithea.model.api_key import ApiKeyModel from kallithea.model.forms import CustomDefaultPermissionsForm, UserForm
--- a/kallithea/controllers/compare.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/compare.py Mon Oct 19 12:18:28 2020 +0200 @@ -39,7 +39,7 @@ from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired from kallithea.lib.base import BaseRepoController, render from kallithea.lib.graphmod import graph_data -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db
--- a/kallithea/controllers/forks.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/forks.py Mon Oct 19 12:18:28 2020 +0200 @@ -41,7 +41,7 @@ from kallithea.lib.base import BaseRepoController, render from kallithea.lib.page import Page from kallithea.lib.utils2 import safe_int -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db from kallithea.model.forms import RepoForkForm from kallithea.model.repo import RepoModel
--- a/kallithea/controllers/login.py Mon May 18 21:16:51 2020 +0200 +++ b/kallithea/controllers/login.py Mon Oct 19 12:18:28 2020 +0200 @@ -40,7 +40,7 @@ from kallithea.lib.auth import AuthUser, HasPermissionAnyDecorator from kallithea.lib.base import BaseController, log_in_user, render from kallithea.lib.exceptions import UserCreationError -from kallithea.lib.utils3 import url +from kallithea.lib.webutils import url from kallithea.model import db, meta from kallithea.model.forms import LoginForm, PasswordResetConfirmationForm, PasswordResetRequestForm, RegisterForm from kallithea.model.user import UserModel