aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins
diff options
context:
space:
mode:
authorOlivier Mehani <shtrom+mediagoblin@ssji.net>2020-05-05 23:11:26 +1000
committerBen Sturmfels <ben@sturm.com.au>2020-05-06 12:03:28 +1000
commit8bb15a5477ca8175d71de9740acbee99ca1946ae (patch)
tree31a6bf6bb5cb2cf7173310a3ed1347f4c87702bc /mediagoblin/plugins
parent7465326f233485dfd1ba76af8073c135e347c4b2 (diff)
downloadmediagoblin-8bb15a5477ca8175d71de9740acbee99ca1946ae.tar.lz
mediagoblin-8bb15a5477ca8175d71de9740acbee99ca1946ae.tar.xz
mediagoblin-8bb15a5477ca8175d71de9740acbee99ca1946ae.zip
Make ldap plugin python3 compatible
Signed-off-by: Olivier Mehani <shtrom+mediagoblin@ssji.net>
Diffstat (limited to 'mediagoblin/plugins')
-rw-r--r--mediagoblin/plugins/ldap/README.rst2
-rw-r--r--mediagoblin/plugins/ldap/tools.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/plugins/ldap/README.rst b/mediagoblin/plugins/ldap/README.rst
index 049b5c4d..fe9a96f5 100644
--- a/mediagoblin/plugins/ldap/README.rst
+++ b/mediagoblin/plugins/ldap/README.rst
@@ -26,7 +26,7 @@ LDAP server.
Set up the LDAP plugin
======================
-1. Install the ``python-ldap`` package.
+1. Install the ``python3-ldap`` package.
2. Add the following to your MediaGoblin .ini file in the ``[plugins]`` section::
diff --git a/mediagoblin/plugins/ldap/tools.py b/mediagoblin/plugins/ldap/tools.py
index 2be2dcd7..9d6d8b2a 100644
--- a/mediagoblin/plugins/ldap/tools.py
+++ b/mediagoblin/plugins/ldap/tools.py
@@ -57,7 +57,7 @@ class LDAP(object):
email = self._get_email(v, username)
return username, email
- except ldap.LDAPError, e:
+ except ldap.LDAPError as e:
_log.info(e)
finally: