Merge branch '2.0'

Author: asmeurer

.travis.yml

@@ -22,7 +22,7 @@ install:
   # Useful for debugging any issues with conda
   - conda info -a
 
-  - conda create -q -n test-environment python=$CONDA_PY 'prompt_toolkit<2' pygments pyflakes pytest iterm2-tools catimg matplotlib jedi sympy seaborn pudb
+  - conda create -q -n test-environment python=$CONDA_PY prompt_toolkit pygments pyflakes pytest iterm2-tools catimg matplotlib jedi sympy seaborn pudb
   - source activate test-environment
 
 script:

2.0-TODO.md

@@ -0,0 +1,7 @@
+- Make all keybindings assign a Document
+- Figure out how to set the prompt-toolkit exception handler
+- Jedi warnings printed to terminal during completion
+- Fix tests
+- Replace "cli" with "app" in the key bindings
+- accept_after_history_backward doesn't work
+- Ask about fixing selection

TODO.md

@@ -41,6 +41,7 @@
 - Issues pasting multiple prompts with emoji prompts
 - Make the command queue not use input
 - Should not allow newline inside single quote string, even in multiline
+- Forward/backward sexp doesn't work unless it's on a parenthesis
 - Print %time time after the output
 - Add line profiler magic
 - Prompt number not incremented when %pudb exits with traceback

conftest.py

@@ -0,0 +1,2 @@
+# Enable the fixture
+from mypython.tests.test_mypython import check_output; check_output

mypython/__init__.py

@@ -1,25 +1,24 @@
-from .mypython import (validate_text, PythonSyntaxValidator,
-    get_continuation_tokens, prompt_style, get_in_prompt_tokens,
-    get_out_prompt_tokens, NoResult, smart_eval, normalize, startup,
-    execute_command, run_shell, myhelp, getsource)
+from .mypython import (validate_text, PythonSyntaxValidator, prompt_style,
+    NoResult, smart_eval, normalize, execute_command, run_shell, myhelp,
+    getsource, Session)
 
-__all__ = ['validate_text', 'PythonSyntaxValidator', 'get_continuation_tokens', 'prompt_style',
-    'get_in_prompt_tokens', 'get_out_prompt_tokens', 'NoResult', 'smart_eval',
-    'normalize', 'startup', 'execute_command', 'run_shell', 'myhelp', 'getsource']
+__all__ = ['validate_text', 'PythonSyntaxValidator', 'prompt_style',
+    'NoResult', 'smart_eval', 'normalize', 'execute_command',
+    'run_shell', 'myhelp', 'getsource', 'Session']
 
-from .keys import get_registry, custom_bindings_registry, split_prompts
+from .keys import get_key_bindings, custom_key_bindings, split_prompts
 
-__all__ += ['get_registry', 'custom_bindings_registry', 'split_prompts']
+__all__ += ['get_key_bindings', 'custom_key_bindings', 'split_prompts']
 
 from .theme import OneAMStyle
 
 __all__ += ['OneAMStyle']
 
 from .multiline import (document_is_multiline_python, auto_newline,
-    TabShouldInsertWhitespaceFilter)
+    tab_should_insert_whitespace)
 
 __all__ += ['document_is_multiline_python',
-    'auto_newline', 'TabShouldInsertWhitespaceFilter']
+    'auto_newline', 'tab_should_insert_whitespace']
 
 from .completion import get_jedi_script_from_document, PythonCompleter
 

mypython/completion.py

@@ -34,11 +34,11 @@
 from .dircompletion import DirCompleter
 from .magic import MAGICS
 
-def get_jedi_script_from_document(document, _locals, _globals):
+def get_jedi_script_from_document(document, _locals, _globals, session):
     import jedi  # We keep this import in-line, to improve start-up time.
                  # Importing Jedi is 'slow'.
 
-    full_document = '\n'.join(i for _, i in sorted(_locals['_CLI'].builtins['In'].items()))
+    full_document = '\n'.join(i for _, i in sorted(session.builtins['In'].items()))
     if not full_document.endswith('\n'):
         full_document += '\n'
 
@@ -57,11 +57,12 @@ class PythonCompleter(Completer):
     """
     Completer for Python code.
     """
-    def __init__(self, get_globals, get_locals):
+    def __init__(self, get_globals, get_locals, session):
         super(PythonCompleter, self).__init__()
 
         self.get_globals = get_globals
         self.get_locals = get_locals
+        self.session = session
 
     def _complete_python_while_typing(self, document):
         char_before_cursor = document.char_before_cursor
@@ -104,7 +105,8 @@ def get_completions(self, document, complete_event):
                 else:
                     break
 
-            script = get_jedi_script_from_document(document, self.get_locals(), self.get_globals())
+            script = get_jedi_script_from_document(document,
+                self.get_locals(), self.get_globals(), self.session)
 
             if script:
                 try:

mypython/keys.py

@@ -1,15 +1,21 @@
 from prompt_toolkit.key_binding.bindings.named_commands import (accept_line,
     self_insert, backward_delete_char, beginning_of_line)
 from prompt_toolkit.key_binding.bindings.basic import if_no_repeat
-from prompt_toolkit.key_binding.defaults import load_key_bindings
-from prompt_toolkit.key_binding.registry import Registry, MergedRegistry
-from prompt_toolkit.keys import Keys, Key
+from prompt_toolkit.key_binding.bindings.basic import load_basic_bindings
+from prompt_toolkit.key_binding.bindings.emacs import load_emacs_bindings, load_emacs_search_bindings
+from prompt_toolkit.key_binding.bindings.mouse import load_mouse_bindings
+from prompt_toolkit.key_binding.bindings.cpr import load_cpr_bindings
+
+from prompt_toolkit.key_binding import KeyBindings, merge_key_bindings
+from prompt_toolkit.keys import Keys, ALL_KEYS
 from prompt_toolkit.filters import Condition, HasSelection
 from prompt_toolkit.selection import SelectionState
 from prompt_toolkit.clipboard import ClipboardData
-from prompt_toolkit.terminal.vt100_input import ANSI_SEQUENCES
+from prompt_toolkit.input.vt100_parser import ANSI_SEQUENCES
+from prompt_toolkit.application.current import get_app
+from prompt_toolkit.application import run_in_terminal
 
-from .multiline import (auto_newline, TabShouldInsertWhitespaceFilter,
+from .multiline import (auto_newline, tab_should_insert_whitespace,
     document_is_multiline_python)
 from .tokenize import inside_string, matching_parens
 from .theme import emoji
@@ -19,24 +25,21 @@
 import sys
 import textwrap
 
-def get_registry():
-    registry = MergedRegistry([
-        load_key_bindings(
-            enable_abort_and_exit_bindings=True,
-            enable_search=True,
-            # Not using now but may in the future
-            enable_auto_suggest_bindings=True,
-            enable_extra_page_navigation=True,
-            # Custom one defined below, without execute
-            enable_open_in_editor=False,
-            enable_system_bindings=True,
-        ),
-        custom_bindings_registry,
-    ])
+def get_key_bindings():
+    # Based on prompt_toolkit.key_binding.defaults.load_key_bindings()
+    return merge_key_bindings([
+        load_basic_bindings(),
+
+        load_emacs_bindings(),
+        load_emacs_search_bindings(),
 
-    return registry
+        load_mouse_bindings(),
+        load_cpr_bindings(),
 
-r = custom_bindings_registry = Registry()
+        custom_key_bindings,
+    ])
+
+r = custom_key_bindings = KeyBindings()
 
 @r.add_binding(Keys.Escape, 'p')
 def previous_history_search(event):
@@ -276,10 +279,14 @@ def right_multiline(event):
 
 @r.add_binding(Keys.ControlD)
 def exit(event):
-    raise EOFError("Control-D")
+    event.app.exit(exception=EOFError, style='class:exiting')
+
+@r.add_binding(Keys.ControlC)
+def keyboard_interrupt(event):
+    event.app.exit(exception=KeyboardInterrupt, style='class:aborting')
 
 is_returnable = Condition(
-    lambda cli: cli.current_buffer.accept_action.is_returnable)
+    lambda: get_app().current_buffer.is_returnable)
 
 @r.add_binding(Keys.Enter, filter=is_returnable)
 def multiline_enter(event):
@@ -320,14 +327,15 @@ def multiline_enter(event):
 @r.add_binding(Keys.Enter, filter=is_returnable)
 def accept_after_history_backward(event):
     pks = event.previous_key_sequence
-    if pks and getattr(pks[-1], 'accept_next', False) and ((len(pks) == 1 and isinstance(pks[0].key, Key) and pks[0].key.name == "<Up>") \
-       or (len(pks) == 2 and isinstance(pks[0].key, Key) and pks[0].key.name == "<Escape>"
-           and isinstance(pks[1].key, str) and pks[1].key in 'pP')):
+    if pks and getattr(pks[-1], 'accept_next', False) and ((len(pks) == 1 and
+        pks[0].key == "<Up>") or (len(pks) == 2 and pks[0].key == "<Escape>"
+            and isinstance(pks[1].key, str) and pks[1].key in 'pP')):
         accept_line(event)
     else:
         multiline_enter(event)
 
 @r.add_binding(Keys.Escape, Keys.Enter)
+@r.add_binding(Keys.Escape, Keys.ControlJ)
 def insert_newline(event):
     auto_newline(event.current_buffer)
 
@@ -337,12 +345,13 @@ def open_line(event):
     event.current_buffer.cursor_left()
 
 # M-[ a g is set to S-Enter in iTerm2 settings
-Keys.ShiftEnter = Key("<Shift-Enter>")
+Keys.ShiftEnter = "<Shift-Enter>"
+ALL_KEYS.append('<Shift-Enter>')
 ANSI_SEQUENCES['\x1b[ag'] = Keys.ShiftEnter
 
 r.add_binding(Keys.ShiftEnter)(accept_line)
 
-@r.add_binding(Keys.Tab, filter=TabShouldInsertWhitespaceFilter())
+@r.add_binding(Keys.Tab, filter=tab_should_insert_whitespace)
 def indent(event):
     """
     When tab should insert whitespace, do that instead of completion.
@@ -641,7 +650,7 @@ def osx_paste():
 def copy_to_clipboard(event):
     if event.current_buffer.document.selection:
         from_, to = event.current_buffer.document.selection_range()
-        event.cli.run_in_terminal(lambda:osx_copy(event.current_buffer.document.text[from_:to + 1]))
+        run_in_terminal(lambda:osx_copy(event.current_buffer.document.text[from_:to + 1]))
 
 @r.add_binding(Keys.ControlX, Keys.ControlY)
 def paste_from_clipboard(event):
@@ -650,13 +659,14 @@ def get_paste():
         nonlocal paste_text
         paste_text = osx_paste()
 
-    event.cli.run_in_terminal(get_paste)
+    run_in_terminal(get_paste)
 
     event.current_buffer.cut_selection()
     event.current_buffer.paste_clipboard_data(ClipboardData(paste_text))
 
 # M-[ a b is set to C-S-/ (C-?) in iTerm2 settings
-Keys.ControlQuestionmark = Key("<C-?>")
+Keys.ControlQuestionmark = "<C-?>"
+ALL_KEYS.append("<C-?>")
 ANSI_SEQUENCES['\x1b[ab'] = Keys.ControlQuestionmark
 
 # This won't work until

mypython/magic.py

@@ -177,7 +177,7 @@ def history_magic(rest):
 import pygments as _pygments
 from mypython.theme import OneAMStyle as _OneAMStyle, MyPython3Lexer as _MyPython3Lexer
 from mypython.mypython import blue as _blue
-_pydoc.pipepager('\\n'.join(_pygments.highlight(i, _MyPython3Lexer(), _pygments.formatters.TerminalTrueColorFormatter(style=_OneAMStyle))+_blue('-'*80) for i in _CLI.current_buffer.history.strings), 'less +G')
+_pydoc.pipepager('\\n'.join(_pygments.highlight(i, _MyPython3Lexer(), _pygments.formatters.TerminalTrueColorFormatter(style=_OneAMStyle))+_blue('-'*80) for i in _PROMPT.current_buffer.history.strings), 'less +G')
 del _pydoc, _pygments, _OneAMStyle, _MyPython3Lexer, _blue
 """
 
@@ -196,7 +196,7 @@ def pudb_magic(rest):
 import bdb as _bdb
 import linecache as _linecache
 
-_filename = '<mypython-pudb-%s>' % _CLI.builtins['PROMPT_NUMBER']
+_filename = '<mypython-pudb-%s>' % PROMPT_NUMBER
 
 _pudb._get_debugger().breaks.setdefault(_filename, [1])
 # Instantiating the Breakpoint class enables the breakpoint. We can't use

mypython/multiline.py

@@ -30,7 +30,8 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
-from prompt_toolkit.filters import Filter
+from prompt_toolkit.application.current import get_app
+from prompt_toolkit.filters.base import Condition
 
 from .tokenize import is_multiline_python
 
@@ -78,14 +79,11 @@ def auto_newline(buffer):
             for x in range(4):
                 insert_text(' ')
 
-class TabShouldInsertWhitespaceFilter(Filter):
-    """
-    When the 'tab' key is pressed with only whitespace character before the
-    cursor, insert indentation. Otherwise, do autocompletion.
+@Condition
+def tab_should_insert_whitespace():
+    app = get_app()
 
-    """
-    def __call__(self, cli):
-        b = cli.current_buffer
-        before_cursor = b.document.current_line_before_cursor
+    b = app.current_buffer
+    before_cursor = b.document.current_line_before_cursor
 
-        return bool(not before_cursor or before_cursor.isspace())
+    return bool(not before_cursor or before_cursor.isspace())