# HG changeset patch # User domruf # Date 1494440004 -7200 # Node ID 13879d044762880daaeb1ad5110d3d0831ab6b5c # Parent 169dc4bd9d5b9c432d41de92750bafcb8c7f3f51 validators: wrap hgsubversion import with try/except block like in settings.py Found by pylint. diff -r 169dc4bd9d5b -r 13879d044762 kallithea/model/validators.py --- a/kallithea/model/validators.py Tue May 09 21:38:00 2017 +0200 +++ b/kallithea/model/validators.py Wed May 10 20:13:24 2017 +0200 @@ -34,7 +34,7 @@ from kallithea.lib.utils import repo_name_slug from kallithea.lib.utils2 import str2bool, aslist from kallithea.model.db import RepoGroup, Repository, UserGroup, User -from kallithea.lib.exceptions import LdapImportError +from kallithea.lib.exceptions import LdapImportError, HgsubversionImportError from kallithea.config.routing import ADMIN_PREFIX from kallithea.lib.auth import HasRepoGroupPermissionLevel, HasPermissionAny @@ -420,7 +420,11 @@ # or does it pass basic auth MercurialRepository._check_url(url, ui) elif url.startswith('svn+http'): - from hgsubversion.svnrepo import svnremoterepo + try: + from hgsubversion.svnrepo import svnremoterepo + except ImportError: + raise HgsubversionImportError(_('Unable to activate hgsubversion support. ' + 'The "hgsubversion" library is missing')) svnremoterepo(ui, url).svn.uuid elif url.startswith('git+http'): raise NotImplementedError()