Add support for X-ORIGIN in schema element class ObjectClass

droideck · droideck · commit 7c22697600c3 · 2018-10-08T18:51:36.000+02:00
diff --git a/Lib/ldap/schema/models.py b/Lib/ldap/schema/models.py
@@ -137,7 +137,8 @@ class ObjectClass(SchemaElement):
     'AUXILIARY':None,
     'ABSTRACT':None,
     'MUST':(()),
-    'MAY':()
+    'MAY':(),
+    'X-ORIGIN':(None,)
   }
 
   def _set_attrs(self,l,d):
@@ -146,6 +147,7 @@ def _set_attrs(self,l,d):
     self.desc = d['DESC'][0]
     self.must = d['MUST']
     self.may = d['MAY']
+    self.x_origin = d['X-ORIGIN'][0]
     # Default is STRUCTURAL, see RFC2552 or draft-ietf-ldapbis-syntaxes
     self.kind = 0
     if d['ABSTRACT']!=None:
@@ -168,6 +170,7 @@ def __str__(self):
     result.append({0:' STRUCTURAL',1:' ABSTRACT',2:' AUXILIARY'}[self.kind])
     result.append(self.key_list('MUST',self.must,sep=' $ '))
     result.append(self.key_list('MAY',self.may,sep=' $ '))
+    result.append(self.key_attr('X-ORIGIN',self.x_origin,quoted=1))
     return '( %s )' % ''.join(result)
 
 
diff --git a/Tests/t_ldap_schema_subentry.py b/Tests/t_ldap_schema_subentry.py
@@ -61,7 +61,7 @@ def test_urlfetch_file(self):
             str(obj),
             "( 2.5.6.9 NAME 'groupOfNames' SUP top STRUCTURAL MUST cn "
             "MAY ( member $ businessCategory $ seeAlso $ owner $ ou $ o "
-            "$ description ) )"
+            "$ description ) X-ORIGIN 'RFC 4519' )"
         )
 
 

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ def test_urlfetch_file(self):`
`61`	`61`	`str(obj),`
`62`	`62`	`"( 2.5.6.9 NAME 'groupOfNames' SUP top STRUCTURAL MUST cn "`
`63`	`63`	`"MAY ( member $ businessCategory $ seeAlso $ owner $ ou $ o "`
`64`		`- "$ description ) )"`
	`64`	`+ "$ description ) X-ORIGIN 'RFC 4519' )"`
`65`	`65`	`)`
`66`	`66`
`67`	`67`