@@ -380,14 +380,14 @@ def __init__(self, t1, t2,
380
380
def __set_or_dict (self ):
381
381
return {} if self .verbose_level >= 2 else set ()
382
382
383
- def __extend_result_list (self , keys , parent , result_obj , print_as_attribute = False ):
383
+ def __extend_result_list (self , keys , parent , report_obj , print_as_attribute = False , obj = None ):
384
384
key_text = "%s{}" .format (INDEX_VS_ATTRIBUTE [print_as_attribute ])
385
385
for i in keys :
386
- if self .__skip_this (i , None , parent + "['" + str ( i ) + "']" ):
386
+ if self .__skip_this (i , None , parent = "{}['{}']" . format ( parent , i ) ):
387
387
continue
388
388
else :
389
389
i = "'%s'" % i if not print_as_attribute and isinstance (i , strings ) else i
390
- result_obj .add (key_text % (parent , i ))
390
+ report_obj .add (key_text % (parent , i ))
391
391
392
392
@staticmethod
393
393
def __add_to_frozen_set (parents_ids , item_id ):
@@ -435,11 +435,11 @@ def __diff_dict(self, t1, t2, parent, parents_ids=frozenset({}), print_as_attrib
435
435
436
436
if t_keys_added :
437
437
self .__extend_result_list (keys = t_keys_added , parent = parent ,
438
- result_obj = self [item_added_key ], print_as_attribute = print_as_attribute )
438
+ report_obj = self [item_added_key ], print_as_attribute = print_as_attribute )
439
439
440
440
if t_keys_removed :
441
441
self .__extend_result_list (keys = t_keys_removed , parent = parent ,
442
- result_obj = self [item_removed_key ], print_as_attribute = print_as_attribute )
442
+ report_obj = self [item_removed_key ], print_as_attribute = print_as_attribute )
443
443
444
444
self .__diff_common_children (
445
445
t1 , t2 , t_keys_intersect , print_as_attribute , parents_ids , parent , parent_text )
@@ -481,11 +481,11 @@ def __diff_set(self, t1, t2, parent="root"):
481
481
482
482
if items_removed :
483
483
self .__extend_result_list (
484
- keys = items_removed , parent = parent , result_obj = self ["set_item_removed" ])
484
+ keys = items_removed , parent = parent , report_obj = self ["set_item_removed" ])
485
485
486
486
if items_added :
487
487
self .__extend_result_list (
488
- keys = items_added , parent = parent , result_obj = self ["set_item_added" ])
488
+ keys = items_added , parent = parent , report_obj = self ["set_item_added" ])
489
489
490
490
def __diff_iterable (self , t1 , t2 , parent = "root" , parents_ids = frozenset ({})):
491
491
"""Difference of iterables except dictionaries, sets and strings."""
0 commit comments