Skip to content

Commit be28a53

Browse files
author
Jiri Hnidek
committed
Bug fix: return layer despite it was not possible to remove item of layer.
1 parent c6de2e4 commit be28a53

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

vrsent/verse_layer.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,12 @@ def cb_receive_layer_destroy(cls, session, node_id, layer_id):
340340
try:
341341
node = session.nodes[node_id]
342342
except KeyError:
343-
return
343+
return None
344344
# Try to find the layer
345345
try:
346346
layer = node.layers[layer_id]
347347
except KeyError:
348-
return
348+
return None
349349
# Destroy layer and child layers
350350
layer.cb_receive_destroy()
351351

@@ -361,12 +361,12 @@ def cb_receive_layer_set_value(cls, session, node_id, layer_id, item_id, value):
361361
try:
362362
node = session.nodes[node_id]
363363
except KeyError:
364-
return
364+
return None
365365
# Try to find the layer
366366
try:
367367
layer = node.layers[layer_id]
368368
except KeyError:
369-
return
369+
return None
370370
# Set item value, but do not send command to verse server
371371
layer.send_cmds = False
372372
layer.items[item_id] = value
@@ -377,24 +377,25 @@ def cb_receive_layer_set_value(cls, session, node_id, layer_id, item_id, value):
377377
@classmethod
378378
def cb_receive_layer_unset_value(cls, session, node_id, layer_id, item_id):
379379
"""
380-
Static method of class that set value of item in layer
380+
Static method of class that unset value of item in layer
381381
"""
382382

383383
# Try to find node
384384
try:
385385
node = session.nodes[node_id]
386386
except KeyError:
387-
return
387+
return None
388388
# Try to find the layer
389389
try:
390390
layer = node.layers[layer_id]
391391
except KeyError:
392-
return
392+
return None
393393
# UnSet item value
394394
try:
395395
layer.items.pop(item_id)
396396
except KeyError:
397-
return
397+
# When item was not found, then return layer
398+
pass
398399

399400
return layer
400401

0 commit comments

Comments
 (0)