Author: Ronny Pfannschmidt <[email protected]>
Branch: codecheck-clean
Changeset: r226:dbed922d398b
Date: 2013-01-16 21:16 +0100
http://bitbucket.org/pypy/pyrepl/changeset/dbed922d398b/
Log: more cleanups
diff --git a/pyrepl/readline.py b/pyrepl/readline.py
--- a/pyrepl/readline.py
+++ b/pyrepl/readline.py
@@ -26,7 +26,8 @@
extensions for multiline input.
"""
-import sys, os
+import sys
+import os
from pyrepl import commands
from pyrepl.historical_reader import HistoricalReader
from pyrepl.completing_reader import CompletingReader
@@ -35,41 +36,43 @@
ENCODING = sys.getfilesystemencoding() or 'latin1' # XXX review
-__all__ = ['add_history',
- 'clear_history',
- 'get_begidx',
- 'get_completer',
- 'get_completer_delims',
- 'get_current_history_length',
- 'get_endidx',
- 'get_history_item',
- 'get_history_length',
- 'get_line_buffer',
- 'insert_text',
- 'parse_and_bind',
- 'read_history_file',
- 'read_init_file',
- 'redisplay',
- 'remove_history_item',
- 'replace_history_item',
- 'set_completer',
- 'set_completer_delims',
- 'set_history_length',
- 'set_pre_input_hook',
- 'set_startup_hook',
- 'write_history_file',
- # ---- multiline extensions ----
- 'multiline_input',
- ]
+__all__ = [
+ 'add_history',
+ 'clear_history',
+ 'get_begidx',
+ 'get_completer',
+ 'get_completer_delims',
+ 'get_current_history_length',
+ 'get_endidx',
+ 'get_history_item',
+ 'get_history_length',
+ 'get_line_buffer',
+ 'insert_text',
+ 'parse_and_bind',
+ 'read_history_file',
+ 'read_init_file',
+ 'redisplay',
+ 'remove_history_item',
+ 'replace_history_item',
+ 'set_completer',
+ 'set_completer_delims',
+ 'set_history_length',
+ 'set_pre_input_hook',
+ 'set_startup_hook',
+ 'write_history_file',
+ # ---- multiline extensions ----
+ 'multiline_input',
+]
# ____________________________________________________________
+
class ReadlineConfig(object):
readline_completer = None
completer_delims = dict.fromkeys(' \t\n`~!@#$%^&*()-=+[{]}\\|;:\'",<>/?')
+
class ReadlineAlikeReader(HistoricalReader, CompletingReader):
-
assume_immutable_completions = False
use_brackets = False
sort_in_column = True
@@ -156,10 +159,11 @@
if self.pos > len(self.buffer):
self.pos = len(self.buffer)
+
class maybe_accept(commands.Command):
def do(self):
r = self.reader
- r.dirty = 1 # this is needed to hide the completion menu, if visible
+ r.dirty = 1 # this is needed to hide the completion menu, if visible
#
# if there are already several lines and the cursor
# is not on the last one, always insert a new \n.
@@ -171,7 +175,6 @@
else:
self.finish = 1
-# ____________________________________________________________
class _ReadlineWrapper(object):
reader = None
@@ -369,6 +372,7 @@
# ____________________________________________________________
# Stubs
+
def _make_stub(_name, _ret):
def stub(*args, **kwds):
import warnings
@@ -380,16 +384,16 @@
('read_init_file', None),
('redisplay', None),
('set_pre_input_hook', None),
- ]:
+]:
assert _name not in globals(), _name
_make_stub(_name, _ret)
-# ____________________________________________________________
def _setup():
global _old_raw_input
if _old_raw_input is not None:
- return # don't run _setup twice
+ return
+ # don't run _setup twice
try:
f_in = sys.stdin.fileno()
diff --git a/pyrepl/simple_interact.py b/pyrepl/simple_interact.py
--- a/pyrepl/simple_interact.py
+++ b/pyrepl/simple_interact.py
@@ -26,6 +26,7 @@
import sys
from pyrepl.readline import multiline_input, _error, _get_reader
+
def check(): # returns False if there is a problem initializing the state
try:
_get_reader()
@@ -33,6 +34,7 @@
return False
return True
+
def run_multiline_interactive_console(mainmodule=None):
import code
import __main__
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
