aboutsummaryrefslogtreecommitdiffstats
path: root/MgaRepo/plugins/ldapusers.py
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2015-10-10 09:16:26 +0200
committerPapoteur <papoteur@mageialinux-online.org>2015-10-10 09:16:26 +0200
commit142d404aa8cffc9f4785e5347f26036463dedcd4 (patch)
treec58f4d5c692c945eb10180baadb123d2c3762ad3 /MgaRepo/plugins/ldapusers.py
parent3e3e90e699192df60eeafb2ec7a9e087aff97195 (diff)
downloadmgarepo-142d404aa8cffc9f4785e5347f26036463dedcd4.tar
mgarepo-142d404aa8cffc9f4785e5347f26036463dedcd4.tar.gz
mgarepo-142d404aa8cffc9f4785e5347f26036463dedcd4.tar.bz2
mgarepo-142d404aa8cffc9f4785e5347f26036463dedcd4.tar.xz
mgarepo-142d404aa8cffc9f4785e5347f26036463dedcd4.zip
Apply 2to3-3.4
Diffstat (limited to 'MgaRepo/plugins/ldapusers.py')
-rw-r--r--MgaRepo/plugins/ldapusers.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/MgaRepo/plugins/ldapusers.py b/MgaRepo/plugins/ldapusers.py
index dd202ed..a32402c 100644
--- a/MgaRepo/plugins/ldapusers.py
+++ b/MgaRepo/plugins/ldapusers.py
@@ -77,19 +77,19 @@ class LDAPError(Error):
def strip_entry(entry):
"Leave only the first value in all keys in the entry"
- new = dict((key, value[0]) for key, value in entry.iteritems())
+ new = dict((key, value[0]) for key, value in entry.items())
return new
def interpolate(optname, format, data):
tmpl = string.Template(format)
try:
return tmpl.substitute(data)
- except KeyError, e:
- raise Error, "the key %s was not found in LDAP search, " \
- "check your %s configuration" % (e, optname)
- except (TypeError, ValueError), e:
- raise Error, "LDAP response formatting error: %s. Check " \
- "your %s configuration" % (e, optname)
+ except KeyError as e:
+ raise Error("the key %s was not found in LDAP search, " \
+ "check your %s configuration" % (e, optname))
+ except (TypeError, ValueError) as e:
+ raise Error("LDAP response formatting error: %s. Check " \
+ "your %s configuration" % (e, optname))
def used_attributes(format):
class DummyDict:
@@ -117,8 +117,8 @@ def make_handler():
try:
port = int(config.get("global", "ldap-port", 389))
except ValueError:
- raise Error, "the option ldap-port requires an integer, please "\
- "check your configuration files"
+ raise Error("the option ldap-port requires an integer, please "\
+ "check your configuration files")
uri = "ldap://%s:%d" % (server, port)
basedn = config.get("global", "ldap-base")
@@ -133,21 +133,21 @@ def make_handler():
try:
starttls = valid[raw]
except KeyError:
- raise Error, "invalid value %r for ldap-starttls, use "\
- "'yes' or 'no'" % raw
+ raise Error("invalid value %r for ldap-starttls, use "\
+ "'yes' or 'no'" % raw)
try:
import ldap
except ImportError:
- raise Error, "LDAP support needs the python-ldap package "\
- "to be installed"
+ raise Error("LDAP support needs the python-ldap package "\
+ "to be installed")
else:
from ldap.filter import escape_filter_chars
def users_wrapper(section, option=None, default=None, walk=False):
global users_cache
if walk:
- raise Error, "ldapusers plugin does not support user listing"
+ raise Error("ldapusers plugin does not support user listing")
assert option is not None, \
"When not section walking, option is required"
@@ -161,7 +161,7 @@ def make_handler():
l.start_tls_s()
if binddn:
l.bind(binddn, bindpw)
- except ldap.LDAPError, e:
+ except ldap.LDAPError as e:
raise LDAPError(e)
try:
data = {"username": escape_filter_chars(option)}
@@ -170,7 +170,7 @@ def make_handler():
try:
found = l.search_s(basedn, ldap.SCOPE_SUBTREE, filter,
attrlist=attrs)
- except ldap.LDAPError, e:
+ except ldap.LDAPError as e:
raise LDAPError(e)
if found:
dn, entry = found[0]