Merge branch 'jonathanslenders-prompt-toolkit-1.0.0'

* jonathanslenders-prompt-toolkit-1.0.0:
  Remove unused import
  Update failing test to use is_exiting attr
  Upgrade to prompt-toolkit 1.0.0

Author: jamesls

awsshell/app.py

@@ -15,7 +15,6 @@
 from prompt_toolkit.filters import Always
 from prompt_toolkit.interface import CommandLineInterface, Application
 from prompt_toolkit.interface import AbortAction, AcceptAction
-from prompt_toolkit.utils import Callback
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 from prompt_toolkit.history import InMemoryHistory, FileHistory
 
@@ -279,7 +278,7 @@ def cli(self):
     def run(self):
         while True:
             try:
-                document = self.cli.run()
+                document = self.cli.run(reset_current_buffer=True)
                 text = document.text
             except InputInterrupt:
                 pass
@@ -423,7 +422,7 @@ def create_application(self, completer, history,
             buffer=self.create_buffer(completer, history),
             on_abort=AbortAction.RETRY,
             on_exit=AbortAction.RAISE_EXCEPTION,
-            on_input_timeout=Callback(self.on_input_timeout),
+            on_input_timeout=self.on_input_timeout,
             key_bindings_registry=self.key_manager.manager.registry,
         )
 

awsshell/style.py

@@ -11,10 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 from pygments.token import Token
-from pygments.style import Style
 from pygments.util import ClassNotFound
 from pygments.styles import get_style_by_name
-from prompt_toolkit.styles import default_style_extensions
+from prompt_toolkit.styles import default_style_extensions, style_from_dict
 
 
 class StyleFactory(object):
@@ -43,32 +42,26 @@ def style_factory(self, style_name):
         except ClassNotFound:
             style = get_style_by_name('vim')
 
-        class CliStyle(Style):
-            """Provides styles for the autocomplete menu and the toolbar.
+        # Create a style dictionary.
+        styles = {}
+        styles.update(style.styles)
+        styles.update(default_style_extensions)
+        t = Token
+        styles.update({
+            t.Menu.Completions.Completion.Current: 'bg:#00aaaa #000000',
+            t.Menu.Completions.Completion: 'bg:#008888 #ffffff',
+            t.Menu.Completions.Meta.Current: 'bg:#00aaaa #000000',
+            t.Menu.Completions.Meta: 'bg:#00aaaa #ffffff',
+            t.Scrollbar.Button: 'bg:#003333',
+            t.Scrollbar: 'bg:#00aaaa',
+            t.Toolbar: 'bg:#222222 #cccccc',
+            t.Toolbar.Off: 'bg:#222222 #696969',
+            t.Toolbar.On: 'bg:#222222 #ffffff',
+            t.Toolbar.Search: 'noinherit bold',
+            t.Toolbar.Search.Text: 'nobold',
+            t.Toolbar.System: 'noinherit bold',
+            t.Toolbar.Arg: 'noinherit bold',
+            t.Toolbar.Arg.Text: 'nobold'
+        })
 
-            :type styles: dict
-            :param styles: Contains pygments style info.
-            """
-
-            styles = {}
-            styles.update(style.styles)
-            styles.update(default_style_extensions)
-            t = Token
-            styles.update({
-                t.Menu.Completions.Completion.Current: 'bg:#00aaaa #000000',
-                t.Menu.Completions.Completion: 'bg:#008888 #ffffff',
-                t.Menu.Completions.Meta.Current: 'bg:#00aaaa #000000',
-                t.Menu.Completions.Meta: 'bg:#00aaaa #ffffff',
-                t.Menu.Completions.ProgressButton: 'bg:#003333',
-                t.Menu.Completions.ProgressBar: 'bg:#00aaaa',
-                t.Toolbar: 'bg:#222222 #cccccc',
-                t.Toolbar.Off: 'bg:#222222 #696969',
-                t.Toolbar.On: 'bg:#222222 #ffffff',
-                t.Toolbar.Search: 'noinherit bold',
-                t.Toolbar.Search.Text: 'nobold',
-                t.Toolbar.System: 'noinherit bold',
-                t.Toolbar.Arg: 'noinherit bold',
-                t.Toolbar.Arg.Text: 'nobold'
-            })
-
-        return CliStyle
+        return style_from_dict(styles)

setup.py

@@ -7,7 +7,7 @@
 
 requires = [
     'awscli>=1.8.9,<2.0.0',
-    'prompt-toolkit==0.52',
+    'prompt-toolkit>=1.0.0,<1.1.0',
     'boto3>=1.2.1,<2.0.0',
     'configobj>=5.0.6,<6.0.0',
     'Pygments>=2.1.3,<3.0.0',

tests/integration/test_keys.py

@@ -52,9 +52,5 @@ def test_F5(self):
             assert show_help != self.aws_shell.show_help
 
     def test_F10(self):
-        # Exiting from the test in this mock test environment will throw:
-        #   IOError: [Errno 25] Inappropriate ioctl for device
-        # In a non-mock test environment it would through a EOFError.
-        # TODO: Probably better to mock the call to event.cli.set_exit().
-        with self.assertRaises(IOError) as e:
-            self.processor.feed_key(KeyPress(Keys.F10, ''))
+        self.processor.feed_key(KeyPress(Keys.F10, ''))
+        assert self.aws_shell.cli.is_exiting