Fix for Flask-SimpleLDAP 2.0.0

cps/admin.py

@@ -1631,7 +1631,10 @@ def import_ldap_users():
 
     imported = 0
     for username in new_users:
-        user = username.decode('utf-8')
+        if isinstance(username, bytes):
+            user = username.decode('utf-8')
+        else:
+            user = username
         if '=' in user:
             # if member object field is empty take user object as filter
             if config.config_ldap_member_user_object:

optional-requirements.txt

@@ -21,7 +21,7 @@ python-Levenshtein>=0.12.0,<0.26.0
 
 # ldap login
 python-ldap>=3.0.0,<3.5.0
-Flask-SimpleLDAP>=1.4.0,<1.5.0
+Flask-SimpleLDAP>=1.4.0,<2.1.0
 
 # oauth
 Flask-Dance>=2.0.0,<7.1.0