modify ldif fragment to conform to grammar in python-ldap 2.4.26

src/ldaptools/slapd.py

@@ -81,6 +81,7 @@ olcRootPW: admin
 olcAccess: {{0}}to *
    by dn.exact=gidNumber={gid}+uidNumber={uid},cn=peercred,cn=external,cn=auth manage
    by * break
+
 '''
     process = None
     schemas = ['core', 'cosine', 'inetorgperson', 'nis', 'eduorg-200210-openldap', 'eduperson',
@@ -118,7 +119,9 @@ olcAccess: {{0}}to *
         self.add_db('o=orga')
         ldif = '''dn: o=orga
 objectClass: organization
-o: orga'''
+o: orga
+
+'''
         self.add_ldif(ldif)
 
     def add_db(self, suffix):
@@ -132,7 +135,9 @@ olcSuffix: {suffix}
 olcDbDirectory: {path}
 olcReadOnly: FALSE
 # Index
-olcAccess: {{0}}to * by * manage'''
+olcAccess: {{0}}to * by * manage
+
+'''
         self.add_ldif(ldif, context={'suffix': suffix, 'path': path})
         self.data_dirs.append(path)
 

tests/conftest.py

@@ -34,7 +34,9 @@ cn: John Doe
 uid: admin
 sn: John
 givenName: Doe
-mail: john.doe@entrouvert.com'''
+mail: john.doe@entrouvert.com
+
+'''
 
 
 @pytest.fixture

tests/test_ldif_utils.py

@@ -2,9 +2,12 @@ import StringIO
 
 from ldaptools.ldif_utils import ListLDIFParser
 
+
 def test_ldifparser():
     parser = ListLDIFParser(StringIO.StringIO('''dn: o=orga
-objectClass: organization'''))
+objectClass: organization
+
+'''))
     parser.parse()
     assert len(list(parser)) == 1
     assert list(parser)[0][0] == 'o=orga'

tests/test_slapd.py

@@ -17,6 +17,7 @@ objectclass: uidObject
 uid:in
 cn: n
 sn: n
+
 ''')
     conn = slapd.get_connection()
     assert len(conn.search_s('o=orga', ldap.SCOPE_SUBTREE)) == 2

tests/test_synchronize.py

@@ -37,7 +37,9 @@ cn: John Doe
 uid: admin
 sn: John
 givenName: Doe
-mail: john.doe@entrouvert.com'''
+mail: john.doe@entrouvert.com
+
+'''
 
     synchronize = syn_ldif(ldif)
     assert all(not action.errors for action in synchronize.actions)
@@ -47,7 +49,9 @@ mail: john.doe@entrouvert.com'''
     # Rename 
     slapd.add_ldif('''dn: ou=people,o=orga
 ou: people
-objectClass: organizationalUnit''')
+objectClass: organizationalUnit
+
+''')
     conn.rename_s('uid=admin,o=orga', 'cn=John Doe', newsuperior='ou=people,o=orga', delold=0)
     assert set([dn for dn, entry in conn.search_s('o=orga', ldap.SCOPE_SUBTREE)]) == set(['o=orga',
                                                                                           'ou=people,o=orga',
@@ -68,6 +72,7 @@ o: orga
 dc: coucou
 objectClass: organization
 objectClass: dcobject
+
 '''
     synchronize = syn_ldif(ldif)
     assert all(not action.errors for action in synchronize.actions)
@@ -97,7 +102,9 @@ cn: John Doe
 uid: admin
 sn: John
 givenName: Doe
-mail: john.doe@entrouvert.com'''
+mail: john.doe@entrouvert.com
+
+'''
     slapd.add_ldif(ldif)
 
     source = LDAPSource(conn, base_dn='dc=orga2', attributes=attributes)
@@ -119,7 +126,9 @@ mail: john.doe@entrouvert.com'''
     # Rename 
     slapd.add_ldif('''dn: ou=people,o=orga
 ou: people
-objectClass: organizationalUnit''')
+objectClass: organizationalUnit
+
+''')
     conn.rename_s('uid=admin,o=orga', 'cn=John Doe', newsuperior='ou=people,o=orga', delold=0)
     assert set([dn for dn, entry in conn.search_s('o=orga', ldap.SCOPE_SUBTREE)]) == set(['o=orga',
                                                                                           'ou=people,o=orga',
@@ -179,7 +188,9 @@ cn: John Doe
 uid: admin
 sn: John
 givenName: Doe
-mail: john.doe@entrouvert.com'''
+mail: john.doe@entrouvert.com
+
+'''
 
     synchronize = syn_ldif(ldif)
     assert all(not action.errors for action in synchronize.actions)
@@ -204,7 +215,9 @@ cn: John Doe
 uid: admin
 sn: John
 givenName: Doe
-mail: john.doe@entrouvert.com'''
+mail: john.doe@entrouvert.com
+
+'''
 
     synchronize = syn_ldif(ldif)