Revision de34ce75

b/commissioning/hlapi/util.py
12 12
        
13 13

  
14 14
def compatible_input_types(given, expected):
15
    print "given=%s, expected=%s" % (given, expected)
15
#    print "given=%s, expected=%s" % (given, expected)
16 16
    if len(given) != len(expected):
17 17
        return False    
18 18
    for i in xrange(len(given)):
......
126 126

  
127 127

  
128 128
def check_string(label, value):
129
    if not isinstance(value, str):
129
    if not issubclass(type(value), basestring):
130 130
        raise Exception(
131 131
            "%s is not a string, but a(n) %s with value %s" % (
132 132
                label, type(value), value))
......
138 138
    return context
139 139

  
140 140

  
141
@accepts(basestring, basestring)
141
@accepts(str, str)
142 142
@returns(bool)
143 143
def is_abs_name(name, label='name'):
144 144
    check_string(label, name)
......
222 222
    len(node_name.split('/')) - 1
223 223
    
224 224

  
225
@accepts(basestring, basestring)
225
@accepts(str, str)
226 226
@returns(bool)
227 227
def is_child_of_abs_name(child, parent):
228 228
    check_abs_name(parent)
......
255 255
            return upto_name
256 256

  
257 257

  
258
@accepts(basestring)
259
@returns(basestring)
258
@accepts(str)
259
@returns(str)
260 260
def last_part_of_abs_name(abs_name, label='abs_name'):
261 261
    """
262 262
    Given an absolute abs_name, which is made of simple parts separated with
......
268 268
    return last_part
269 269

  
270 270

  
271
@accepts(basestring, basestring, basestring, basestring)
272
@returns(basestring)
271
@accepts(str, str, str, str)
272
@returns(str)
273 273
def reparent_child_name_under(child_name,
274 274
                              parent_node_name,
275 275
                              child_label='child_name',
......
317 317
                                     parent_label='NameOfUsersNode')
318 318

  
319 319

  
320
@accepts(basestring, basestring, basestring, basestring)
321
@returns(basestring)
320
@accepts(str, str, str, str)
321
@returns(str)
322 322
def relative_child_name_under(child_name,
323 323
                              parent_name,
324 324
                              child_label='child_name',
......
343 343
    return child_name[len(parent_name) + 1:]
344 344

  
345 345

  
346
@accepts(basestring, basestring)
347
@returns(basestring)
346
@accepts(str, str)
347
@returns(str)
348 348
def make_rel_group_name(group_name, label='group_name'):
349 349
    check_name(group_name, label)
350 350
    return relative_child_name_under(child_name=group_name,
......
353 353
                                     parent_label='NameOfGroupsNode')
354 354
    
355 355

  
356
@accepts(basestring, basestring)
357
@returns(basestring)
356
@accepts(str, str)
357
@returns(str)
358 358
def make_rel_global_resource_name(resource_name, label='resource_name'):
359 359
    check_name(resource_name, label)
360 360
    return relative_child_name_under(child_name=resource_name,
......
363 363
                                     parent_label='NameOfResourcesNode')
364 364
    
365 365

  
366
@accepts(basestring, basestring)
367
@returns(basestring)
366
@accepts(str, str)
367
@returns(str)
368 368
def make_rel_user_name(user_name, label='user_name'):
369 369
    check_name(user_name, label)
370 370
    return relative_child_name_under(child_name=user_name,

Also available in: Unified diff