Use consistent exceptions for all user backends

Now all backends raise custom exception types and does not
forward the internal exception types. So there is no need
to import the ldap module in other modules.

1 files changed, 2 insertions, 4 deletions

diff --git a/accounts/utils/__init__.py b/accounts/utils/__init__.py
index 1538fd6..2b0f566 100644
--- a/accounts/utils/__init__.py
+++ b/accounts/utils/__init__.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import hmac
 import importlib
-import ldap
 import pickle
 import re
 import struct
@@ -70,9 +69,8 @@ def login_user(username, password):
 
     try:
         g.user = current_app.user_backend.auth(username, password)
-    except ldap.INVALID_CREDENTIALS:
-        return False
-    except ldap.NO_SUCH_OBJECT:
+    except (current_app.user_backend.NoSuchUserError,
+            current_app.user_backend.InvalidPasswordError):
         return False
 
     session['username'] = username