@@ -714,7 +714,11 @@ def execute(self):
714
714
op_first .location == op_second .location and \
715
715
type (op_first ) == RemoveOperation and \
716
716
type (op_second ) == AddOperation ):
717
- yield ReplaceOperation ({'op' : 'replace' , 'path' : op_second .location , 'value' : op_second .operation ['value' ]}).operation
717
+ yield ReplaceOperation ({
718
+ 'op' : 'replace' ,
719
+ 'path' : op_second .location ,
720
+ 'value' : op_second .operation ['value' ],
721
+ }).operation
718
722
curr = curr [1 ][1 ]
719
723
continue
720
724
yield curr [2 ].operation
@@ -734,15 +738,27 @@ def _item_added(path, key, info, item):
734
738
op .key = v ._on_undo_remove (op .path , op .key )
735
739
info .remove (index )
736
740
if op .location != _path_join (path , key ):
737
- new_op = MoveOperation ({'op' : 'move' , 'from' : op .location , 'path' : _path_join (path , key )})
741
+ new_op = MoveOperation ({
742
+ 'op' : 'move' ,
743
+ 'from' : op .location ,
744
+ 'path' : _path_join (path , key ),
745
+ })
738
746
info .insert (new_op )
739
747
else :
740
- new_op = AddOperation ({'op' : 'add' , 'path' : _path_join (path , key ), 'value' : item })
748
+ new_op = AddOperation ({
749
+ 'op' : 'add' ,
750
+ 'path' : _path_join (path , key ),
751
+ 'value' : item ,
752
+ })
741
753
new_index = info .insert (new_op )
742
754
info .store_index (item , new_index , _ST_ADD )
743
755
744
756
def _item_removed (path , key , info , item ):
745
- new_op = RemoveOperation ({'op' : 'remove' , 'path' : _path_join (path , key ), 'value' : item })
757
+ new_op = RemoveOperation ({
758
+ 'op' : 'remove' ,
759
+ 'path' : _path_join (path , key ),
760
+ 'value' : item ,
761
+ })
746
762
index = info .take_index (item , _ST_ADD )
747
763
new_index = info .insert (new_op )
748
764
if index != None :
@@ -752,15 +768,23 @@ def _item_removed(path, key, info, item):
752
768
op .key = v ._on_undo_add (op .path , op .key )
753
769
info .remove (index )
754
770
if new_op .location != op .location :
755
- new_op = MoveOperation ({'op' : 'move' , 'from' : new_op .location , 'path' : op .location })
771
+ new_op = MoveOperation ({
772
+ 'op' : 'move' ,
773
+ 'from' : new_op .location ,
774
+ 'path' : op .location ,
775
+ })
756
776
new_index [2 ] = new_op
757
777
else :
758
778
info .remove (new_index )
759
779
else :
760
780
info .store_index (item , new_index , _ST_REMOVE )
761
781
762
782
def _item_replaced (path , key , info , item ):
763
- info .insert (ReplaceOperation ({'op' : 'replace' , 'path' : _path_join (path , key ), 'value' : item }))
783
+ info .insert (ReplaceOperation ({
784
+ 'op' : 'replace' ,
785
+ 'path' : _path_join (path , key ),
786
+ 'value' : item ,
787
+ }))
764
788
765
789
def _compare_dicts (path , info , src , dst ):
766
790
src_keys = _viewkeys (src )
0 commit comments