Imported Debian patch 4.0.5-6~numeezy

makeaci

@@ -24,15 +24,22 @@
 # to ensure that changes aren't made lightly.
 # Can either regenerate ACI.txt, or validate against it.
 
-from __future__ import print_function
-
 import sys
 import difflib
 from argparse import ArgumentParser
 
 from ipalib import api
 from ipapython.dn import DN
-from ipapython.ipaldap import LDAPEntry, LDAPClient
+from ipapython.ipaldap import LDAPEntry, IPASimpleLDAPObject, LDAPClient
+
+
+class FakeLDAPClient(LDAPClient):
+    """A LDAP client that can't do any LDAP operations
+
+    Used to create and manipulate entries without an LDAP connection.
+    """
+    def _init_connection(self):
+        self.conn = IPASimpleLDAPObject('', False, no_schema=True)
 
 
 def parse_options():
@@ -50,7 +57,7 @@ def generate_aci_lines(api):
     """Yields ACI lines as they appear in ACI.txt, with trailing newline"""
     update_plugin = api.Updater['update_managed_permissions']
     perm_plugin = api.Object['permission']
-    fake_ldap = LDAPClient('', force_schema_updates=False, no_schema=True)
+    fake_ldap = FakeLDAPClient('')
     for name, template, obj in update_plugin.get_templates():
         dn = perm_plugin.get_dn(name)
         entry = fake_ldap.make_entry(dn)
@@ -97,8 +104,9 @@ def main(options):
         basedn=DN('dc=ipa,dc=example'),
         realm='IPA.EXAMPLE',
     )
-    api.import_plugins('ipaserver.plugins.ldap2')
-    api.import_plugins('ipaserver.install.plugins.update_managed_permissions')
+    from ipaserver.install.plugins.update_managed_permissions import (
+        update_managed_permissions)
+    from ipalib.plugins.permission import permission
     api.finalize()
 
     output_lines = list(generate_aci_lines(api))
@@ -114,10 +122,10 @@ def main(options):
                 tofile='new result',
             ))
             for line in diff:
-                print(line, end=' ')
-            print(file=sys.stderr)
-            print('Managed permission ACI validation failed.', file=sys.stderr)
-            print('Re-check permission changes and run `makeaci`.', file=sys.stderr)
+                print line,
+            print>>sys.stderr
+            print>>sys.stderr, 'Managed permission ACI validation failed.'
+            print>>sys.stderr, 'Re-check permission changes and run `makeaci`.'
             exit('%s validation failed' % options.filename)
     else:
         with open(options.filename, 'w') as file: