From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 11 Mar 2014 12:07:00 +0000 (-0400)
Subject: [3373] Typo on comment.
X-Git-Tag: kea-eng-20140313~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff46195513aff7b46efdd3c4d06bd777bc86c352;p=thirdparty%2Fkea.git

[3373] Typo on comment.
---

diff --git a/src/lib/python/isc/cc/data.py b/src/lib/python/isc/cc/data.py
index 0e084e232e..83e15bed22 100644
--- a/src/lib/python/isc/cc/data.py
+++ b/src/lib/python/isc/cc/data.py
@@ -56,7 +56,7 @@ def merge(orig, new):
        any elements which are themselves dictionaries. If an element value
        is None in new it will be removed in orig. Previously this method
        relied on dict.update but this does not do deep merges properly.
-       Raises a DataTypeError is either argument is not a dict"""
+       Raises a DataTypeError if either argument is not a dict"""
     if type(orig) != dict or type(new) != dict:
         raise DataTypeError("Not a dict in merge()")