Port custom modules to python3.

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/modules/openldap b/lib/modules/openldap
index 9b015b6..9afe1f1 100644
--- a/lib/modules/openldap
+++ b/lib/modules/openldap
@@ -1,21 +1,21 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # Manage OpenLDAP databases
 # Copyright (c) 2013 Guilhem Moulin <guilhem@fripost.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import ldap, ldap.sasl
 from ldap.filter  import filter_format
 from ldap.dn      import dn2str,explode_dn,str2dn
@@ -286,41 +286,41 @@ def main():
     delete      = params['delete']
 
     changed = False
     try:
         if delete is not None:
             if name is None:
                 module.fail_json(msg="missing name")
             l = ldap.initialize( 'ldapi://' )
             l.sasl_interactive_bind_s('', ldap.sasl.external())
             if delete == 'entry':
                 filterStr = '(objectClass=*)'
             else:
                 filterStr = [ '(%s=*)' % x for x in delete.split(',') ]
                 if len(filterStr) > 1:
                     filterStr = '(|' + ''.join(filterStr) + ')'
                 else:
                     filterStr = filterStr[0]
 
             try:
                 r = l.search_s( name, ldap.SCOPE_BASE, filterStr, attrsonly=1 )
-            except ldap.LDAPError, ldap.NO_SUCH_OBJECT:
+            except (ldap.LDAPError, ldap.NO_SUCH_OBJECT):
                 r = None
 
             if r:
                 changed = True
                 if module.check_mode:
                     module.exit_json(changed=changed)
                 if delete == 'entry':
                     l.delete_s(r[0][0])
                 else:
                     attrlist = list(set(r[0][1].keys()) & set(delete.split(',')))
                     l.modify_s(r[0][0], [ (ldap.MOD_DELETE, x, None) for x in attrlist ])
             l.unbind_s()
 
         else:
             if form == 'slapd.conf':
                 if name is None:
                     module.fail_json(msg="missing name")
                 target = slapd_to_ldif(target, name)
 
             if target is None and mod is None:
@@ -335,40 +335,40 @@ def main():
                 changed |= loadModule (module, l, '%s.la' % mod)
                 if target is None and suffix is None:
                     l.unbind_s()
                     module.exit_json(changed=changed)
                 if target is None or suffix is None:
                     module.fail_json(msg="missing target or suffix")
                 r = getDN_DB(module, l, 'olcSuffix', suffix)
                 if not r:
                     module.fail_json(msg="No database found for suffix %s" % suffix)
                 elif len(r) > 1:
                     module.fail_json(msg="Multiple results found! This is a bug. Please report.")
                 else:
                     d = 'olcOverlay=%s,%s' % (mod, r.pop()[0])
                     callback = lambda _,e: processEntry(module,l,d,e)
 
             parser = LDIFCallback( module, open(target, 'r'), callback )
             parser.parse()
             changed = parser.changed
             l.unbind_s()
 
-    except subprocess.CalledProcessError, e:
+    except subprocess.CalledProcessError as e:
         module.fail_json(rv=e.returncode, msg=e.output.rstrip())
-    except ldap.LDAPError, e:
+    except ldap.LDAPError as e:
         e = e.args[0]
         if 'info' in e.keys():
             msg = e['info']
         elif 'desc' in e.keys():
             msg = e['desc']
         else:
             msg = str(e)
         module.fail_json(msg=msg)
-    except KeyError, e:
+    except KeyError as e:
         module.fail_json(msg=str(e))
 
     module.exit_json(changed=changed)
 
 # import module snippets
 from ansible.module_utils.basic import *
 
 main()