wassname/pyreadline
1
0
Fork 0
mirror of https://github.com/wassname/pyreadline.git synced 2026-06-27 16:10:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

py3 unified files pyreadline/modes/*.py

Browse Source
This commit is contained in:
Jrgen Stenarson
2012-02-15 20:57:27 +01:00
parent 7d73e01a56
commit e312fb0a1e
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyreadline/modes/basemode.py
+6 -5
View File
@@ -8,6 +8,7 @@
#*****************************************************************************
from __future__ import print_function, unicode_literals, absolute_import
import os, re, math, glob, sys, time
from pyreadline.py3k_compat import callable
import pyreadline.logger as logger
from pyreadline.logger import log
from pyreadline.keysyms.common import make_KeyPress_from_keydescr
@@ -149,7 +150,7 @@ class BaseMode(object):
out.append("------------- key bindings ------------")
tablepat="%-7s %-7s %-7s %-15s %-15s "
out.append(tablepat%("Control","Meta","Shift","Keycode/char","Function"))
bindings=[(k[0],k[1],k[2],k[3],v.__name__) for k,v in self.key_dispatch.iteritems()]
bindings=[(k[0],k[1],k[2],k[3],v.__name__) for k,v in self.key_dispatch.items()]
bindings.sort()
for key in bindings:
out.append(tablepat%(key))
@@ -206,7 +207,7 @@ class BaseMode(object):
completions.append(r)
else:
pass
log('text completions=<%s>' % map(ensure_unicode, completions))
log('text completions=<%s>' % list(map(ensure_unicode, completions)))
if (self.complete_filesystem == "on") and not completions:
# get the filename to complete
while self.begidx > 0:
@@ -216,7 +217,7 @@ class BaseMode(object):
break
text = ensure_str(''.join(buf[self.begidx:self.endidx]))
log('file complete text="%s"' % ensure_unicode(text))
completions = map(ensure_unicode, glob.glob(os.path.expanduser(text) + '*'.encode('ascii')))
completions = list(map(ensure_unicode, glob.glob(os.path.expanduser(text) + '*'.encode('ascii'))))
if self.mark_directories == 'on':
mc = []
for f in completions:
@@ -225,7 +226,7 @@ class BaseMode(object):
else:
mc.append(f)
completions = mc
log('fnames=<%s>' % map(ensure_unicode, completions))
log('fnames=<%s>' % list(map(ensure_unicode, completions)))
return completions
@@ -486,7 +487,7 @@ class BaseMode(object):
if self.enable_win32_clipboard:
txt=clipboard.get_clipboard_text_and_convert(False)
txt=txt.split("\n")[0].strip("\r").strip("\n")
log("paste: >%s<"%map(ord,txt))
log("paste: >%s<"%list(map(ord,txt)))
self.insert_text(txt)
self.finalize()
pyreadline/modes/emacs.py
+1 -1
View File
@@ -37,7 +37,7 @@ class IncrementalSearchPromptMode(object):
#dispatch_func = self.key_dispatch.get(keytuple, default)
revtuples = []
fwdtuples = []
for ktuple, func in self.key_dispatch.iteritems():
for ktuple, func in self.key_dispatch.items():
if func == self.reverse_search_history:
revtuples.append(ktuple)
elif func == self.forward_search_history:
pyreadline/modes/vi.py
+3 -3
View File
@@ -233,15 +233,15 @@ class ViMode(basemode.BaseMode):
self.vi_error ()
self.vi_undo ()
return
if not self.vi_search (range (position, -1, -1)):
if not self.vi_search (list(range(position, -1, -1))):
# Here: search text not found
self.vi_undo ()
def vi_search_again_backward (self):
self.vi_search (range (self._history.history_cursor-1, -1, -1))
self.vi_search (list(range(self._history.history_cursor-1, -1, -1)))
def vi_search_again_forward (self):
self.vi_search (range (self._history.history_cursor+1, len(self._history.history)))
self.vi_search (list(range(self._history.history_cursor+1, len(self._history.history))))
def vi_up (self, e):
if self._history.history_cursor == len(self._history.history):