Merge remote-tracking branch 'aws-master/master'

# Conflicts:
#	awsshell/app.py

Author: chronologos

awsshell/app.py

@@ -220,7 +220,8 @@ class AWSShell(object):
 
     """
 
-    def __init__(self, completer, model_completer, docs):
+    def __init__(self, completer, model_completer, docs,
+                 input=None, output=None):
         self.completer = completer
         self.model_completer = model_completer
         self.history = InMemoryHistory()
@@ -233,6 +234,8 @@ def __init__(self, completer, model_completer, docs):
         self._dot_cmd = DotCommandHandler()
         self._env = os.environ.copy()
         self._profile = None
+        self._input = input
+        self._output = output
         self.prompt_tokens = u'aws > '
 
         # These attrs come from the config file.
@@ -481,7 +484,8 @@ def create_cli_interface(self, display_completions_in_columns):
         app = self.create_application(self.completer,
                                       self.file_history,
                                       display_completions_in_columns)
-        cli = CommandLineInterface(application=app, eventloop=loop)
+        cli = CommandLineInterface(application=app, eventloop=loop,
+                                   input=self._input, output=self._output)
         return cli
 
     @property

tests/integration/test_keys.py

@@ -11,11 +11,11 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import mock
-import sys
 
+from prompt_toolkit.input import PipeInput
+from prompt_toolkit.output import DummyOutput
 from prompt_toolkit.key_binding.input_processor import KeyPress
 from prompt_toolkit.keys import Keys
-from prompt_toolkit.interface import CommandLineInterface
 
 from tests.compat import unittest
 from awsshell.app import AWSShell, InputInterrupt
@@ -24,9 +24,15 @@
 class KeysTest(unittest.TestCase):
 
     def setUp(self):
-        self.aws_shell = AWSShell(None, mock.Mock(), mock.Mock())
+        self.input = PipeInput()
+        output = DummyOutput()
+        self.aws_shell = AWSShell(None, mock.Mock(), mock.Mock(),
+                                  input=self.input, output=output)
         self.processor = self.aws_shell.cli.input_processor
 
+    def tearDown(self):
+        self.input.close()
+
     def feed_key(self, key):
         self.processor.feed(KeyPress(key, u''))
         self.processor.process_keys()