Skip to content

Commit 8622217

Browse files
stroederencukou
stroeder
authored and
encukou
committed
removed almost all assert statements in ldap.schema.models, removed importing of types module
1 parent 082490a commit 8622217

1 file changed

Lines changed: 2 additions & 52 deletions

File tree

‎Lib/ldap/schema/models.py‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88

99
from ldap.schema.tokenizer import split_tokens,extract_tokens
1010

11-
if __debug__:
12-
from types import TupleType,StringType,IntType
13-
try:
14-
from types import BooleanType
15-
except ImportError:
16-
BooleanType = IntType
17-
18-
1911
NOT_HUMAN_READABLE_LDAP_SYNTAXES = {
2012
'1.3.6.1.4.1.1466.115.121.1.4':None, # Audio
2113
'1.3.6.1.4.1.1466.115.121.1.5':None, # Binary
@@ -68,7 +60,7 @@ def get_id(self):
6860
return self.oid
6961

7062
def key_attr(self,key,value,quoted=0):
71-
assert value is None or type(value)==StringType,TypeError("value has to be of StringType, was %s" % repr(value))
63+
assert value is None or type(value)==str,TypeError("value has to be of str, was %r" % value)
7264
if value:
7365
if quoted:
7466
return " %s '%s'" % (key,value.replace("'","\\'"))
@@ -78,7 +70,7 @@ def key_attr(self,key,value,quoted=0):
7870
return ""
7971

8072
def key_list(self,key,values,sep=' ',quoted=0):
81-
assert type(values)==TupleType,TypeError("values has to be of ListType")
73+
assert type(values)==tuple,TypeError("values has to be a tuple, was %r" % values)
8274
if not values:
8375
return ''
8476
if quoted:
@@ -159,13 +151,6 @@ def _set_attrs(self,l,d):
159151
self.sup = ('top',)
160152
else:
161153
self.sup = d['SUP']
162-
assert type(self.names)==TupleType
163-
assert self.desc is None or type(self.desc)==StringType
164-
assert type(self.obsolete)==BooleanType and (self.obsolete==0 or self.obsolete==1)
165-
assert type(self.sup)==TupleType
166-
assert type(self.kind)==IntType
167-
assert type(self.must)==TupleType
168-
assert type(self.may)==TupleType
169154
return
170155

171156
def __str__(self):
@@ -286,14 +271,6 @@ def _set_attrs(self,l,d):
286271
self.collective = d['COLLECTIVE']!=None
287272
self.no_user_mod = d['NO-USER-MODIFICATION']!=None
288273
self.usage = AttributeUsage.get(d['USAGE'][0],0)
289-
assert type(self.names)==TupleType
290-
assert self.desc is None or type(self.desc)==StringType
291-
assert type(self.sup)==TupleType,'attribute sup has type %s' % (type(self.sup))
292-
assert type(self.obsolete)==BooleanType and (self.obsolete==0 or self.obsolete==1)
293-
assert type(self.single_value)==BooleanType and (self.single_value==0 or self.single_value==1)
294-
assert type(self.no_user_mod)==BooleanType and (self.no_user_mod==0 or self.no_user_mod==1)
295-
assert self.syntax is None or type(self.syntax)==StringType
296-
assert self.syntax_len is None or type(self.syntax_len)==type(0L)
297274
return
298275

299276
def __str__(self):
@@ -351,7 +328,6 @@ def _set_attrs(self,l,d):
351328
NOT_HUMAN_READABLE_LDAP_SYNTAXES.has_key(self.oid) or \
352329
d['X-NOT-HUMAN-READABLE'][0]=='TRUE'
353330
self.x_binary_transfer_required = d['X-BINARY-TRANSFER-REQUIRED'][0]=='TRUE'
354-
assert self.desc is None or type(self.desc)==StringType
355331
return
356332

357333
def __str__(self):
@@ -398,10 +374,6 @@ def _set_attrs(self,l,d):
398374
self.desc = d['DESC'][0]
399375
self.obsolete = d['OBSOLETE']!=None
400376
self.syntax = d['SYNTAX'][0]
401-
assert type(self.names)==TupleType
402-
assert self.desc is None or type(self.desc)==StringType
403-
assert type(self.obsolete)==BooleanType and (self.obsolete==0 or self.obsolete==1)
404-
assert self.syntax is None or type(self.syntax)==StringType
405377
return
406378

407379
def __str__(self):
@@ -448,10 +420,6 @@ def _set_attrs(self,l,d):
448420
self.desc = d['DESC'][0]
449421
self.obsolete = d['OBSOLETE']!=None
450422
self.applies = d['APPLIES']
451-
assert type(self.names)==TupleType
452-
assert self.desc is None or type(self.desc)==StringType
453-
assert type(self.obsolete)==BooleanType and (self.obsolete==0 or self.obsolete==1)
454-
assert type(self.applies)==TupleType
455423
return
456424

457425
def __str__(self):
@@ -515,13 +483,6 @@ def _set_attrs(self,l,d):
515483
self.must = d['MUST']
516484
self.may = d['MAY']
517485
self.nots = d['NOT']
518-
assert type(self.names)==TupleType
519-
assert self.desc is None or type(self.desc)==StringType
520-
assert type(self.obsolete)==BooleanType and (self.obsolete==0 or self.obsolete==1)
521-
assert type(self.aux)==TupleType
522-
assert type(self.must)==TupleType
523-
assert type(self.may)==TupleType
524-
assert type(self.nots)==TupleType
525486
return
526487

527488
def __str__(self):
@@ -582,11 +543,6 @@ def _set_attrs(self,l,d):
582543
self.obsolete = d['OBSOLETE']!=None
583544
self.form = d['FORM'][0]
584545
self.sup = d['SUP']
585-
assert type(self.names)==TupleType
586-
assert self.desc is None or type(self.desc)==StringType
587-
assert type(self.obsolete)==BooleanType and (self.obsolete==0 or self.obsolete==1)
588-
assert type(self.form)==StringType
589-
assert type(self.sup)==TupleType
590546
return
591547

592548
def __str__(self):
@@ -646,12 +602,6 @@ def _set_attrs(self,l,d):
646602
self.oc = d['OC'][0]
647603
self.must = d['MUST']
648604
self.may = d['MAY']
649-
assert type(self.names)==TupleType
650-
assert self.desc is None or type(self.desc)==StringType
651-
assert type(self.obsolete)==BooleanType and (self.obsolete==0 or self.obsolete==1)
652-
assert type(self.oc)==StringType
653-
assert type(self.must)==TupleType
654-
assert type(self.may)==TupleType
655605
return
656606

657607
def __str__(self):

0 commit comments

Comments
 (0)