diff options
| -rw-r--r-- | cmd2/cmd2.py | 4 | ||||
| -rw-r--r-- | tests/test_plugin.py | 32 |
2 files changed, 18 insertions, 18 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index ba774f0b..0179de2b 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -3129,8 +3129,8 @@ Script should contain one command per line, just like command would be typed in cls._validate_callable_param_count(func, 0) # make sure there is no return notation signature = inspect.signature(func) - if signature.return_annotation != signature.empty: - raise TypeError('{} should not have a declared return type'.format( + if signature.return_annotation != None: + raise TypeError("{} must declare return a return type of 'None'".format( func.__name__, )) diff --git a/tests/test_plugin.py b/tests/test_plugin.py index f3db853b..714001d7 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -25,20 +25,20 @@ class Plugin: self.called_postparsing = 0 self.called_precmd = 0 - def prepost_hook_one(self): + def prepost_hook_one(self) -> None: "Method used for preloop or postloop hooks" self.poutput("one") - def prepost_hook_two(self): + def prepost_hook_two(self) -> None: "Another method used for preloop or postloop hooks" self.poutput("two") - def prepost_hook_too_many_parameters(self, param): + def prepost_hook_too_many_parameters(self, param) -> None: "A preloop or postloop hook with too many parameters" pass - def prepost_hook_with_return_type(self) -> bool: - "A preloop or postloop hook with a declared return type" + def prepost_hook_with_wrong_return_type(self) -> bool: + "A preloop or postloop hook with incorrect return type" pass def postparse_hook(self, statement: cmd2.Statement) -> Tuple[bool, cmd2.Statement]: @@ -94,19 +94,19 @@ class Plugin: "A precommand hook with too many parameters" return one - def precmd_hook_no_parameter_annotation(self, mydat) -> plugin.PrecommandData: + def precmd_hook_no_parameter_type(self, mydat) -> plugin.PrecommandData: "A precommand hook with no type annotation on the parameter" return mydat - def precmd_hook_wrong_parameter_annotation(self, mydat: str) -> plugin.PrecommandData: + def precmd_hook_wrong_parameter_type(self, mydat: str) -> plugin.PrecommandData: "A precommand hook with the incorrect type annotation on the parameter" return mydat - def precmd_hook_no_return_annotation(self, mydat: plugin.PrecommandData): + def precmd_hook_no_return_type(self, mydat: plugin.PrecommandData): "A precommand hook with no type annotation on the return value" return mydat - def precmd_hook_wrong_return_annotation(self, mydat: plugin.PrecommandData) -> cmd2.Statement: + def precmd_hook_wrong_return_type(self, mydat: plugin.PrecommandData) -> cmd2.Statement: return self.statement_parser.parse('hi there') @@ -132,7 +132,7 @@ def test_register_preloop_hook_too_many_parameters(): def test_register_preloop_hook_with_return_type(): app = PluggedApp() with pytest.raises(TypeError): - app.register_preloop_hook(app.prepost_hook_with_return_type) + app.register_preloop_hook(app.prepost_hook_with_wrong_return_type) def test_preloop_hook(capsys): app = PluggedApp() @@ -160,10 +160,10 @@ def test_register_postloop_hook_too_many_parameters(): with pytest.raises(TypeError): app.register_postloop_hook(app.prepost_hook_too_many_parameters) -def test_register_postloop_hook_with_return_type(): +def test_register_postloop_hook_with_wrong_return_type(): app = PluggedApp() with pytest.raises(TypeError): - app.register_postloop_hook(app.prepost_hook_with_return_type) + app.register_postloop_hook(app.prepost_hook_with_wrong_return_type) def test_postloop_hook(capsys): app = PluggedApp() @@ -336,22 +336,22 @@ def test_register_precmd_hook_parameter_count(): def test_register_precmd_hook_no_parameter_annotation(): app = PluggedApp() with pytest.raises(TypeError): - app.register_precmd_hook(app.precmd_hook_no_parameter_annotation) + app.register_precmd_hook(app.precmd_hook_no_parameter_type) def test_register_precmd_hook_wrong_parameter_annotation(): app = PluggedApp() with pytest.raises(TypeError): - app.register_precmd_hook(app.precmd_hook_wrong_parameter_annotation) + app.register_precmd_hook(app.precmd_hook_wrong_parameter_type) def test_register_precmd_hook_no_return_annotation(): app = PluggedApp() with pytest.raises(TypeError): - app.register_precmd_hook(app.precmd_hook_no_return_annotation) + app.register_precmd_hook(app.precmd_hook_no_return_type) def test_register_precmd_hook_wrong_return_annotation(): app = PluggedApp() with pytest.raises(TypeError): - app.register_precmd_hook(app.precmd_hook_wrong_return_annotation) + app.register_precmd_hook(app.precmd_hook_wrong_return_type) def test_precmd_hook(capsys): app = PluggedApp() |