From 888805eb639705b420c430727c2443189fcf8ab1 Mon Sep 17 00:00:00 2001 From: Christian Trautman Date: Fri, 19 Feb 2016 15:50:54 -0500 Subject: [PATCH] pktgen: docstring fix Fixed docstring to correctly reflect python output from using merge_spec function. JIRA: VSPERF-210 Change-Id: Ie3bf2a3d148aa9823bafafe8c61c4c94f00ccc87 Signed-off-by: Christian Trautman Reviewed-by: Maryam Tahhan --- tools/pkt_gen/trafficgen/trafficgenhelper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pkt_gen/trafficgen/trafficgenhelper.py b/tools/pkt_gen/trafficgen/trafficgenhelper.py index f5ac539d..97cf6377 100644 --- a/tools/pkt_gen/trafficgen/trafficgenhelper.py +++ b/tools/pkt_gen/trafficgen/trafficgenhelper.py @@ -63,7 +63,7 @@ def merge_spec(orig, new): >>> old = {'foo': 1, 'bar': {'foo': 2, 'bar': 3}} >>> new = {'foo': 6, 'bar': {'foo': 7}} >>> merge_spec(old, new) - {'foo': 3, 'bar': {'foo': 7, 'bar': 3}} + {'foo': 6, 'bar': {'foo': 7, 'bar': 3}} You'll notice that ``bar.bar`` is not removed. This is the desired result. """ -- 2.16.6