Removed BadArgumentFormat's redundant 'param' parameter.

epsy · Mar 12, 2015 · 68be29c · 68be29c
1 parent f50402e
commit 68be29c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/clize/errors.py b/clize/errors.py
@@ -118,8 +118,7 @@ class CliValueError(ValueError):
 class BadArgumentFormat(ArgumentError):
     """Raised when an argument cannot be converted to the correct format."""
 
-    def __init__(self, param, text):
-        self.param = param
+    def __init__(self, text):
         self.text = text
 
     @property

diff --git a/clize/parameters.py b/clize/parameters.py
@@ -62,8 +62,7 @@ def coerce_value(self, value, ba):
         try:
             return table[key]
         except KeyError:
-            raise errors.BadArgumentFormat(
-                _DummyType(repr(self.display_name)), value)
+            raise errors.BadArgumentFormat(value)
 
     def read_argument(self, ba, i):
         try:

diff --git a/clize/parser.py b/clize/parser.py
@@ -257,11 +257,11 @@ def coerce_value(self, arg, ba):
         try:
             ret = self.conv(arg)
         except errors.CliValueError as e:
-            exc = errors.BadArgumentFormat(self, e)
+            exc = errors.BadArgumentFormat(e)
             exc.__cause__ = e
             raise exc
         except ValueError as e:
-            exc = errors.BadArgumentFormat(self, repr(arg))
+            exc = errors.BadArgumentFormat(repr(arg))
             exc.__cause__ = e
             raise exc
         else:

diff --git a/clize/tests/test_parameters.py b/clize/tests/test_parameters.py
@@ -251,13 +251,20 @@ def test_show_list_alt(self):
             ba.func('name', *ba.args, **ba.kwargs).split())
 
 
+baf = errors.BadArgumentFormat
+
+
 @annotated_sigerror_tests
 class MappedErrorTests(object):
-    not_found = RepTests.mapped_basic, ['dog']
-    forced_scase = RepTests.mapped_force_scase, ['thing']
+    not_found = RepTests.mapped_basic, ['dog'], baf, 'Bad value for par: dog'
+    forced_scase = (
+        RepTests.mapped_force_scase, ['thing'],
+        baf, 'Bad value for par: thing')
     bas_icase = RepTests.mapped_bad_icase, ['anything'], ValueError
-    alternate = RepTests.mapped_alternate_list, ['list']
-    none = RepTests.mapped_no_list, ['list']
+    alternate = (
+        RepTests.mapped_alternate_list, ['list'],
+        baf, 'Bad value for par: list')
+    none = RepTests.mapped_no_list, ['list'], baf, 'Bad value for par: list'
 
 
 @test_help