Current File : //lib/python2.7/site-packages/salt/utils/dictdiffer.pyo
�
���^c @@ s� d Z d d l m Z m Z m Z d d l Z d d l m Z d d l m Z d � Z
d e f d � � YZ d d � Z e d
� Z d e f d � � YZ d S(
u�
Calculate the difference between two dictionaries as:
(1) items added
(2) items removed
(3) keys same in both but changed values
(4) keys same in both and unchanged values
Originally posted at http://stackoverflow.com/questions/1165352/fast-comparison-between-two-python-dictionary/1165552#1165552
Available at repository: https://github.com/hughdbrown/dictdiffer
Added the ability to recursively compare dictionaries
i ( t absolute_importt print_functiont unicode_literalsN( t Mapping( t sixc C@ s
t | | � S( N( t
DictDiffer( t current_dictt past_dict( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt diff s R c B@ s; e Z d Z d � Z d � Z d � Z d � Z d � Z RS( u�
Calculate the difference between two dictionaries as:
(1) items added
(2) items removed
(3) keys same in both but changed values
(4) keys same in both and unchanged values
c C@ sZ | | | _ | _ t t | � � t t | � � | _ | _ | j j | j � | _ d S( N( R R t sett listt set_currentt set_pastt intersectiont intersect( t selfR R ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt __init__ s +c C@ s | j | j S( N( R R ( R ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt added% s c C@ s | j | j S( N( R R ( R ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt removed( s c @ s t � f d � � j D� � S( Nc 3@ s/ | ]% } � j | � j | k r | Vq d S( N( R R ( t .0t o( R ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pys <genexpr>, s ( R R ( R ( ( R s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt changed+ s c @ s t � f d � � j D� � S( Nc 3@ s/ | ]% } � j | � j | k r | Vq d S( N( R R ( R R ( R ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pys <genexpr>/ s ( R R ( R ( ( R s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt unchanged. s ( t __name__t
__module__t __doc__R R R R R ( ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyR s c
C@ s� | p g } i } t j | � } t j | � } | | t f g } x\t | � d k r�g } | j � \ } } } xt t | � t | � � D]� } | | k r� | | k r� | | | | k r� | | =| | =q� n | s� | | k r� | | k r� | | =n | | k r | | k r | | =n t | j | � t � rst | j | � t � rs| j
| | | | t f � qsq� q� W| rE | j | | t f g | � qE qE W| r�| | d <n | r�| | d <n | S( Ni u oldu new(
t copyt deepcopyt Falset lent popR R
t
isinstancet getR t appendt extendt True(
t oldt newt ignoret rest stackt tmpst tmp_oldt tmp_newt reentrantt key( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt deep_diff2 s: #
($
c C@ s t | | | � S( u�
Returns a RecursiveDictDiffer object that computes the recursive diffs
between two dictionaries
past_dict
Past dictionary
current_dict
Current dictionary
ignore_missing_keys
Flag specifying whether to ignore keys that no longer exist in the
current_dict, but exist in the past_dict. If true, the diff will
not contain the missing keys.
Default is True.
( t RecursiveDictDiffer( R R t ignore_missing_keys( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt recursive_diffS s R/ c B@ s� e Z d Z d Z d � Z e d � � Z e d d � � Z e d � � Z d � Z d � Z
d � Z d
� Z e
d � � Z e
d � � Z e
d
� � Z e
d � � Z RS( u�
Calculates a recursive diff between the current_dict and the past_dict
creating a diff in the format
{'new': new_value, 'old': old_value}
It recursively searches differences in common keys whose values are
dictionaries creating a diff dict in the format
{'common_key' : {'new': new_value, 'old': old_value}
The class overrides all DictDiffer methods, returning lists of keys and
subkeys using the . notation (i.e 'common_key1.common_key2.changed_key')
The class provides access to:
(1) the added, removed, changes keys and subkeys (using the . notation)
``added``, ``removed``, ``changed`` methods
(2) the diffs in the format aboce (diff property)
``diffs`` property
(3) a dict with the new changed values only (new_values property)
``new_values`` property
(4) a dict with the old changed values only (old_values property)
``old_values`` property
(5) a string representation of the changes in the format:
``changes_str`` property
Note:
The <_null_> value is a reserved value
.. code-block:: text
common_key1:
common_key2:
changed_key1 from '<old_str>' to '<new_str>'
changed_key2 from '[<old_elem1>, ..]' to '[<new_elem1>, ..]'
common_key3:
changed_key3 from <old_int> to <new_int>
u <_null_>c C@ sD t t | � j | | � | j | j | j | � | _ t | _ d S( uQ
past_dict
Past dictionary.
current_dict
Current dictionary.
ignore_missing_keys
Flag specifying whether to ignore keys that no longer exist in the
current_dict, but exist in the past_dict. If true, the diff will
not contain the missing keys.
N( t superR/ R t
_get_diffsR R t _diffsR# t ignore_unset_values( R R R R0 ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyR � s
c C@ s[ i } x� | j � D]� } | | k rQ | j i i | | d 6| j d 6| 6� q | | | | k r t | | t � r� t | | t � r� | j | | | | | � } | r� | j i | | 6� q� q� | j i i | | d 6| | d 6| 6� q q W| sWxU | j � D]D } | | j � k r | j i i | j d 6| | d 6| 6� q q Wn | S( u
Returns a dict with the differences between dict1 and dict2
Notes:
Keys that only exist in dict2 are not included in the diff if
ignore_missing_keys is True, otherwise they are
Simple compares are done on lists
u newu old( t keyst updatet
NONE_VALUER t dictR3 ( t clst dict1t dict2R0 t ret_dictt pt
sub_diff_dict( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyR3 � s"
,& 1 u newc C@ s} i } xp | j � D]b } | | | j � k rN | j i | | | | 6� q | j i | j | | d | �| 6� q W| S( u�
Returns a dictionaries with the 'new' values in a diff dict.
type
Which values to return, 'new' or 'old'
t type( R6 R7 t _get_values( R: t diff_dictR@ R= R> ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyRA � s %c C@ s� g } x�t | j � � D]�} t | | j � � d d g k r�| | d } | | d | j k ro d } nn t | | d t j � r� d j | | d � } n: t | | d t � r� d j d j | | d � � } n | | d } | | d | j k r d } nn t | | d t j � r?d j | | d � } n: t | | d t � ryd j d j | | d � � } n | j d j | | | � � q | j
| | � } | r | j d j | � � | j g | D] } d j | � ^ q�� q q W| S( u�
Returns a list of string message with the differences in a diff dict.
Each inner difference is tabulated two space deeper
u newu oldu nothingu '{0}'u , u {0} from {1} to {2}u {0}:u {0}( t sortedR6 R8 R R t string_typest formatR
t joinR! t _get_changesR" ( R: RB t changes_stringsR> t old_valuet new_valuet sub_changest c( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyRG � s4 " # 'c @ s+ � � f d � � t � � j d d �� S( u�
Returns all keys that have been added.
If the keys are in child dictionaries they will be represented with
. notation
c @ s� g } x� | j � D]� } t | | t � rh d | | k rh | j � | | d d j | | � �� q | | d � j k r t | | d t � r� | j � | | d d d j | | � �� q� | j d j | | � � q q W| S( Nu oldt prefixu {0}{1}.u newu {0}{1}( R6 R R9 R" RE R8 R! ( t diffsRM R6 R- ( t _addedR ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyRO � s # RM u ( RC R4 ( R ( ( RO R s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyR � s c @ s+ � � f d � � t � � j d d �� S( u�
Returns all keys that have been removed.
If the keys are in child dictionaries they will be represented with
. notation
c @ s� g } x� | j � D]� } t | | t � rh d | | k rh | j � | | d d j | | � �� q | | d � j k r� | j d j | | � � q t | | d t � r | j � | | d d d j | | � �� q q W| S( Nu oldRM u {0}{1}.u newu {0}{1}( R6 R R9 R" RE R8 R! ( RN RM R6 R- ( t _removedR ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyRP s # RM u ( RC R4 ( R ( ( RP R s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyR s c @ s+ � � f d � � t � � j d d �� S( u�
Returns all keys that have been changed.
If the keys are in child dictionaries they will be represented with
. notation
c @ sJ g } x=| j � D]/} t | | t � s2 q n t | | t � r� d | | k r� | j � | | d d j | | � �� q n � j r�d | | k r>d | | k r>| | d � j k r>| | d � j k r>t | | d t � r"| j � | | d d d j | | � �� q}| j d j | | � � qBt | | t � rB| j � | | d d j | | � �� qBq d | | k rd | | k rt | | d t � r�| j � | | d d d j | | � �� qB| j d j | | � � q t | | t � r | j � | | d d j | | � �� q q W| S( Nu oldRM u {0}{1}.u newu {0}{1}( R6 R R9 R" RE R5 R8 R! ( RN RM R6 R- ( t _changedR ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyRQ - s@ #
RM u ( RC R4 ( R ( ( RQ R s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyR & s 'c @ s. � f d � � t � | j | j d d �� S( u�
Returns all keys that have been unchanged.
If the keys are in child dictionaries they will be represented with
. notation
c @ s� g } x� | j � D]� } | | k rA | j d j | | � � q t | | t � r d | | k rj q q� | j � | | | | d d j | | � �� q q W| S( Nu {0}{1}u newRM u {0}{1}.( R6 R! RE R R9 R" ( R RN RM R6 R- ( t
_unchanged( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyRR ] s
RM u ( RC R R4 ( R ( ( RR s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyR V s c C@ s | j S( u@ Returns a dict with the recursive diffs current_dict - past_dict( R4 ( R ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyRN o s c C@ s | j | j d d �S( u( Returns a dictionary with the new valuesR@ u new( RA R4 ( R ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt
new_valuest s c C@ s | j | j d d �S( u( Returns a dictionary with the old valuesR@ u old( RA R4 ( R ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt
old_valuesy s c C@ s d j | j | j � � S( u' Returns a string describing the changesu
( RF RG R4 ( R ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt changes_str~ s ( R R R R8 R t classmethodR3 RA RG R R R R t propertyRN RS RT RU ( ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyR/ g s ' $ 0 ( R t
__future__R R R R t collectionsR t salt.extR R t objectR t NoneR. R# R1 R/ ( ( ( s9 /usr/lib/python2.7/site-packages/salt/utils/dictdiffer.pyt <module>
s !
Mini Shell