BIND 10 #3373: Python cc data merge function does not properly merge map sub elements

[BIND 10 Development]

#3373: Python cc data merge function does not properly merge map sub elements
-------------------------------------+-------------------------------------
            Reporter:  tmark         |                        Owner:  tmark
                Type:  defect        |                       Status:
            Priority:  high          |  reviewing
           Component:  dhcp-ddns     |                    Milestone:  DHCP-
            Keywords:                |  Kea0.9
           Sensitive:  0             |                   Resolution:
         Sub-Project:  DHCP          |                 CVSS Scoring:
Estimated Difficulty:  4             |              Defect Severity:  N/A
         Total Hours:  3.5           |  Feature Depending on Ticket:
                                     |          Add Hours to Ticket:  0.5
                                     |                    Internal?:  0
-------------------------------------+-------------------------------------

Comment (by tmark):

 Replying to [comment:6 marcin]:
 > Reviewed bf76c3bd4855432b96d05b67774c8d53702fe275
 >
 > Overall the changes are good. Just a few nits.
 >
 > The merge code could be simplified a bit:
 > {{{
 >     for key in new.keys():
 >         if ((key in orig) and (type(orig[key]) == dict)):
 >             merge(orig[key], new[key])
 >         else:
 >             orig[key] = new[key]
 >
 > }}}
 >
 > You can, but you don't have to do this change, as it doesn't really
 change the behavior of the code.
 >

 You're quite right.  I have to admit I was rather aggravated with this all
 lib at the time.
 I have simplified it.

 I also improved the function commentary, which as you pointed out in
 jabber was grammatically a mess, even for Polglish ;)

 > Copyright dates should be updated.
 >

 Got it

 > Please remember to include ticket number and commit hash in the
 !ChangeLog entry.
 >
 I always do.

 > I don't need to see this ticket again. Once you're done, please merge.
 >

-- 
Ticket URL: <https://bind10.isc.org/ticket/3373#comment:7>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development