Improve the warning message for E1124[redundant-keyword-arg].

3 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d5e490..83e6a40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ ChangeLog for PyLint
     * Simplify checks for dangerous default values by unifying tests
       for all different mutable compound literals.
 
+    * Improve the description for E1124[redundant-keyword-arg]
+
 
 2013-02-26 -- 0.27.0
 
diff --git a/checkers/typecheck.py b/checkers/typecheck.py
index 95289f0..3dcac24 100644
--- a/checkers/typecheck.py
+++ b/checkers/typecheck.py
@@ -63,7 +63,7 @@ MSGS = {
               'unexpected-keyword-arg',
               'Used when a function call passes a keyword argument that \
               doesn\'t correspond to one of the function\'s parameter names.'),
-    'E1124': ('Multiple values passed for parameter %r in function call',
+    'E1124': ('Parameter %r passed as both positional and keyword argument',
               'redundant-keyword-arg',
               'Used when a function call would result in assigning multiple \
               values to a function parameter, one value from a positional \
diff --git a/test/messages/func_arguments.txt b/test/messages/func_arguments.txt
index 24bbdc4..33dbf56 100644
--- a/test/messages/func_arguments.txt
+++ b/test/messages/func_arguments.txt
@@ -8,4 +8,4 @@ E: 24: Too many positional arguments for function call
 E: 31: No value passed for parameter 'first_argument' in function call
 E: 31: Passing unexpected keyword argument 'bob' in function call
 E: 32: Passing unexpected keyword argument 'coin' in function call
-E: 34: Multiple values passed for parameter 'one' in function call
+E: 34: Parameter 'one' passed as both positional and keyword argument