Mercurial > kallithea

diff rhodecode/lib/auth.py @ 713:1bb0fcdec895 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed #72 show warning on removal when user still is owner of existing repositories cleaned up exceptions
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 18 Nov 2010 03:29:23 +0100
parents 9e9f1b919c0c
children 54684e071457
line wrap: on
line diff
--- a/rhodecode/lib/auth.py	Thu Nov 18 03:05:29 2010 +0100
+++ b/rhodecode/lib/auth.py	Thu Nov 18 03:29:23 2010 +0100
@@ -24,8 +24,9 @@
 """
 from pylons import config, session, url, request
 from pylons.controllers.util import abort, redirect
+from rhodecode.lib.exceptions import *
 from rhodecode.lib.utils import get_repo_slug
-from rhodecode.lib.auth_ldap import AuthLdap, UsernameError, PasswordError
+from rhodecode.lib.auth_ldap import AuthLdap
 from rhodecode.model import meta
 from rhodecode.model.user import UserModel
 from rhodecode.model.caching_query import FromCache
@@ -129,7 +130,7 @@
                     log.info('created new ldap user')
 
                 return authenticated
-            except (UsernameError, PasswordError):
+            except (LdapUsernameError, LdapPasswordError):
                 return False
             except:
                 log.error(traceback.format_exc())