From e53c293efad5c0dbc1ffee72b9fbdc109d78e978 Mon Sep 17 00:00:00 2001 From: Douglas Danger Manley Date: Fri, 17 Jun 2022 10:11:45 -0400 Subject: [PATCH] Support Python3 by replacing `raw_input` with `input` This fixes #83. In Python3, `raw_input` is not available, but `input` does pretty much the same thing. --- action_plugins/prompt.py | 2 +- test/test_ask.py | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/action_plugins/prompt.py b/action_plugins/prompt.py index af90770..600c13b 100644 --- a/action_plugins/prompt.py +++ b/action_plugins/prompt.py @@ -241,7 +241,7 @@ def _prompt(self, result, msg): m['postfix'] ) - var = raw_input(askstr) + var = input(askstr) if var != "": if 'confirm' in m and var.lower() not in "yn": diff --git a/test/test_ask.py b/test/test_ask.py index 383341b..b51dcd6 100644 --- a/test/test_ask.py +++ b/test/test_ask.py @@ -112,7 +112,7 @@ def test_prompt_setInput_default_valid(self): '/dev/tty' ) - with mock.patch('__builtin__.raw_input', return_value='mocked input') as mockinput: + with mock.patch('__builtin__.input', return_value='mocked input') as mockinput: result = self.prompt._prompt({}, { 'say': 'test', 'ask': 'varname' @@ -134,7 +134,7 @@ def test_prompt_setInput_stringio_valid(self): self.assertEquals(instr, self.prompt._instr) self.assertEquals(instr.getvalue(), "") - with mock.patch('__builtin__.raw_input', return_value='mocked input') as mockinput: + with mock.patch('__builtin__.input', return_value='mocked input') as mockinput: result = self.prompt._prompt({}, { 'say': 'test', 'ask': 'varname' @@ -261,7 +261,7 @@ def test_prompt_ask_var_simple_valid(self): .. versionadded:: 0.2.0 .. function:: test_prompt_ask_var_simple_valid() """ - with mock.patch('__builtin__.raw_input', return_value='mocked input') as mockinput: + with mock.patch('__builtin__.input', return_value='mocked input') as mockinput: result = self.prompt._prompt({}, { 'say': 'test', 'ask': 'varname' @@ -277,7 +277,7 @@ def test_prompt_ask_var_numbers_valid(self): .. versionadded:: 0.2.0 .. function:: test_prompt_ask_var_numbers_valid() """ - with mock.patch('__builtin__.raw_input', return_value='mocked input') as mockinput: + with mock.patch('__builtin__.input', return_value='mocked input') as mockinput: result = self.prompt._prompt({}, { 'say': 'test', 'ask': '12345' @@ -293,7 +293,7 @@ def test_prompt_ask_var_unicode_valid(self): .. versionadded:: 0.2.0 .. function:: test_prompt_ask_var_unicode_valid() """ - with mock.patch('__builtin__.raw_input', return_value='mocked input') as mockinput: + with mock.patch('__builtin__.input', return_value='mocked input') as mockinput: result = self.prompt._prompt({}, { 'say': 'test', 'ask': u'varname' @@ -309,7 +309,7 @@ def test_prompt_ask_var_underscore_valid(self): .. versionadded:: 0.2.0 .. function:: test_prompt_ask_var_underscore_valid() """ - with mock.patch('__builtin__.raw_input', return_value='mocked input') as mockinput: + with mock.patch('__builtin__.input', return_value='mocked input') as mockinput: result = self.prompt._prompt({}, { 'say': 'test', 'ask': 'var_name' @@ -325,7 +325,7 @@ def test_prompt_ask_say_missing_valid(self): .. versionadded:: 0.2.0 .. function:: test_prompt_ask_say_missing_valid() """ - with mock.patch('__builtin__.raw_input', return_value='mocked input') as mockinput: + with mock.patch('__builtin__.input', return_value='mocked input') as mockinput: result = self.prompt._prompt({}, { 'ask': 'varname' }) @@ -490,7 +490,7 @@ def return_helper(*args, **kwargs): return "" - with mock.patch('__builtin__.raw_input', side_effect=return_helper) as mockinput: + with mock.patch('__builtin__.input', side_effect=return_helper) as mockinput: result = self.prompt._prompt({}, { 'ask': 'varname' }) @@ -506,7 +506,7 @@ def test_prompt_msg_shows_default(self): .. versionadded:: 1.0.0 .. function:: test_prompt_msg_shows_default() """ - with mock.patch('__builtin__.raw_input', return_value="Andrew") as mockinput: + with mock.patch('__builtin__.input', return_value="Andrew") as mockinput: result = self.prompt._prompt(self.response, { "say": "First Name", "ask": "first_name", @@ -527,7 +527,7 @@ def test_prompt_msg_defaults(self): .. versionadded:: 1.0.0 .. function:: test_prompt_msg_defaults() """ - with mock.patch('__builtin__.raw_input', return_value="") as mockinput: + with mock.patch('__builtin__.input', return_value="") as mockinput: result = self.prompt._prompt(self.response, { "say": "First Name", "ask": "first_name", @@ -547,7 +547,7 @@ def test_prompt_msg_postfix_custom(self): .. versionadded:: 1.0.0 .. function:: test_prompt_msg_postfix_custom() """ - with mock.patch('__builtin__.raw_input', return_value="") as mockinput: + with mock.patch('__builtin__.input', return_value="") as mockinput: result = self.prompt._prompt(self.response, { "say": "First Name", "ask": "first_name", @@ -568,7 +568,7 @@ def test_prompt_msg_trim_default(self): .. versionadded:: 1.0.0 .. function:: test_prompt_msg_trim_default() """ - with mock.patch('__builtin__.raw_input', return_value=" trim value ") as mockinput: + with mock.patch('__builtin__.input', return_value=" trim value ") as mockinput: result = self.prompt._prompt(self.response, { "say": "First Name", "ask": "first_name", @@ -584,7 +584,7 @@ def test_prompt_msg_trim_off_valid(self): .. versionadded:: 1.0.0 .. function:: test_prompt_msg_trim_off_valid() """ - with mock.patch('__builtin__.raw_input', return_value=" trim value ") as mockinput: + with mock.patch('__builtin__.input', return_value=" trim value ") as mockinput: result = self.prompt._prompt(self.response, { "say": "First Name", "ask": "first_name", @@ -616,7 +616,7 @@ def return_helper(*args, **kwargs): return "foobar" - with mock.patch('__builtin__.raw_input', side_effect=return_helper) as mockinput: + with mock.patch('__builtin__.input', side_effect=return_helper) as mockinput: result = self.prompt._prompt(self.response, { "say": "Continue", "ask": "result", @@ -637,7 +637,7 @@ def test_prompt_msg_confirm_blank_default_yes(self): .. versionadded:: 1.0.0 .. function:: test_prompt_msg_confirm_blank_default_yes() """ - with mock.patch('__builtin__.raw_input', return_value="") as mockinput: + with mock.patch('__builtin__.input', return_value="") as mockinput: result = self.prompt._prompt(self.response, { "say": "Continue", "ask": "result", @@ -657,7 +657,7 @@ def test_prompt_msg_confirm_blank_default_no(self): .. versionadded:: 1.0.0 .. function:: test_prompt_msg_confirm_blank_default_no() """ - with mock.patch('__builtin__.raw_input', return_value="") as mockinput: + with mock.patch('__builtin__.input', return_value="") as mockinput: result = self.prompt._prompt(self.response, { "say": "Continue", "ask": "result", @@ -677,7 +677,7 @@ def test_prompt_msg_confirm_capital_valid(self): .. versionadded:: 1.0.0 .. function:: test_prompt_msg_confirm_capital_valid() """ - with mock.patch('__builtin__.raw_input', return_value="Y") as mockinput: + with mock.patch('__builtin__.input', return_value="Y") as mockinput: result = self.prompt._prompt(self.response, { "say": "Continue", "ask": "result",