[WIP] pyrepl from PyPy

pyrepl/commands.py

@@ -369,8 +369,12 @@ def do(self):
 
 class qIHelp(Command):
     def do(self):
+        from .reader import disp_str
+
         r = self.reader
-        r.insert((bytes(self.event) + r.console.getpending().data) * r.get_arg())
+        pending = r.console.getpending().data
+        disp = disp_str((self.event + pending))[0]
+        r.insert(disp * r.get_arg())
         r.pop_input_trans()
 
 from pyrepl import input
@@ -379,7 +383,7 @@ class QITrans(object):
     def push(self, evt):
         self.evt = evt
     def get(self):
-        return ('qIHelp', self.evt.raw)
+        return ('qIHelp', self.evt.data)
 
 class quoted_insert(Command):
     kills_digit_arg = 0

pyrepl/completer.py

@@ -19,12 +19,10 @@
 
 try:
     import __builtin__ as builtins
-    builtins  # silence broken pyflakes
 except ImportError:
     import builtins
 
-
-class Completer(object):
+class Completer:
     def __init__(self, ns):
         self.ns = ns
 
@@ -81,10 +79,11 @@ def attr_matches(self, text):
                 matches.append("%s.%s" % (expr, word))
         return matches
 
-
 def get_class_members(klass):
     ret = dir(klass)
     if hasattr(klass, '__bases__'):
         for base in klass.__bases__:
             ret = ret + get_class_members(base)
     return ret
+
+

pyrepl/completing_reader.py

@@ -40,6 +40,7 @@ def prefix(wordlist, j=0):
 
 STRIPCOLOR_REGEX = re.compile(r"\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[m|K]")
 
+
 def stripcolor(s):
     return STRIPCOLOR_REGEX.sub('', s)
 
@@ -65,8 +66,8 @@ def build_menu(cons, wordlist, start, use_brackets, sort_in_column):
         item = "%s  "
         padding = 2
     maxlen = min(max(map(real_len, wordlist)), cons.width - padding)
-    cols = int(cons.width / (maxlen + padding))
-    rows = int((len(wordlist) - 1)/cols + 1)
+    cols = cons.width // (maxlen + padding)
+    rows = (len(wordlist) - 1) // cols + 1
 
     if sort_in_column:
         # sort_in_column=False (default)     sort_in_column=True
@@ -104,7 +105,7 @@ def build_menu(cons, wordlist, start, use_brackets, sort_in_column):
 #  To summarise the summary of the summary:- people are a problem.
 #                  -- The Hitch-Hikers Guide to the Galaxy, Episode 12
 
-#### Desired behaviour of the completions commands.
+# Desired behaviour of the completions commands.
 # the considerations are:
 # (1) how many completions are possible
 # (2) whether the last command was a completion
@@ -275,7 +276,7 @@ def get_completions(self, stem):
     reader.ps1 = "c**> "
     reader.ps2 = "c/*> "
     reader.ps3 = "c|*> "
-    reader.ps4 = "c\*> "
+    reader.ps4 = r"c\*> "
     while reader.readline():
         pass
 

pyrepl/console.py

@@ -17,7 +17,6 @@
 # CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-
 class Event(object):
     """An Event.  `evt' is 'key' or somesuch."""
     __slots__ = 'evt', 'data', 'raw'
@@ -42,7 +41,7 @@ class Console(object):
     height,
     width,
     """
-
+    
     def refresh(self, screen, xy):
         pass
 

pyrepl/curses.py

@@ -19,5 +19,26 @@
 # CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+# If we are running on top of pypy, we import only _minimal_curses.
+# Don't try to fall back to _curses, because that's going to use cffi
+# and fall again more loudly.
+import sys
+if '__pypy__' in sys.builtin_module_names:
+    # pypy case
+    import _minimal_curses as _curses
+else:
+    # cpython case
+    try:
+        import _curses
+    except ImportError:
+        # Who knows, maybe some environment has "curses" but not "_curses".
+        # If not, at least the following import gives a clean ImportError.
+        try:
+            import curses as _curses
+        except ImportError:
+            import _curses
 
-from ._minimal_curses import setupterm, tigetstr, tparm, error
+setupterm = _curses.setupterm
+tigetstr = _curses.tigetstr
+tparm = _curses.tparm
+error = _curses.error

pyrepl/historical_reader.py

@@ -17,7 +17,7 @@
 # CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-from pyrepl import reader, commands
+from pyrepl import reader, commands, input
 from pyrepl.reader import Reader as R
 
 isearch_keymap = tuple(
@@ -215,7 +215,6 @@ def __init__(self, console):
                   isearch_forwards, isearch_backwards, operate_and_get_next]:
             self.commands[c.__name__] = c
             self.commands[c.__name__.replace('_', '-')] = c
-        from pyrepl import input
         self.isearch_trans = input.KeymapTranslator(
             isearch_keymap, invalid_cls=isearch_end,
             character_cls=isearch_add_character)

pyrepl/keymaps.py

@@ -62,7 +62,7 @@
      (r'\M-\n', 'self-insert'),
      (r'\<backslash>', 'self-insert')] + \
     [(c, 'self-insert')
-     for c in map(chr, range(32, 127)) if c <> '\\'] + \
+     for c in map(chr, range(32, 127)) if c != '\\'] + \
     [(c, 'self-insert')
      for c in map(chr, range(128, 256)) if c.isalpha()] + \
     [(r'\<up>', 'up'),
@@ -101,7 +101,7 @@
 
 reader_vi_insert_keymap = tuple(
     [(c, 'self-insert')
-     for c in map(chr, range(32, 127)) if c <> '\\'] + \
+     for c in map(chr, range(32, 127)) if c != '\\'] + \
     [(c, 'self-insert')
      for c in map(chr, range(128, 256)) if c.isalpha()] + \
     [(r'\C-d', 'delete'),

pyrepl/module_lister.py

@@ -40,8 +40,8 @@ def _make_module_list_dir(dir, suffs, prefix=''):
     return sorted(set(l))
 
 def _make_module_list():
-    import imp
-    suffs = [x[0] for x in imp.get_suffixes() if x[0] != '.pyc']
+    import importlib.machinery
+    suffs = [x for x in importlib.machinery.all_suffixes() if x != '.pyc']
     suffs.sort(reverse=True)
     _packages[''] = list(sys.builtin_module_names)
     for dir in sys.path:

pyrepl/pygame_console.py

@@ -130,7 +130,7 @@ def paint_margin(self):
         s.fill(c, [0, 600 - bmargin, 800, bmargin])
         s.fill(c, [800 - rmargin, 0, lmargin, 600])
 
-    def refresh(self, screen, (cx, cy)):
+    def refresh(self, screen, cxy):
         self.screen = screen
         self.pygame_screen.fill(colors.bg,
                                 [0, tmargin + self.cur_top + self.scroll,
@@ -139,6 +139,7 @@ def refresh(self, screen, (cx, cy)):
 
         line_top = self.cur_top
         width, height = self.fontsize
+        cx, cy = cxy
         self.cxy = (cx, cy)
         cp = self.char_pos(cx, cy)
         if cp[1] < tmargin:
@@ -282,7 +283,7 @@ def flushoutput(self):
 
     def forgetinput(self):
         """Forget all pending, but not yet processed input."""
-        while pygame.event.poll().type <> NOEVENT:
+        while pygame.event.poll().type != NOEVENT:
             pass
 
     def getpending(self):
@@ -299,7 +300,7 @@ def getpending(self):
 
     def wait(self):
         """Wait for an event."""
-        raise Exception, "erp!"
+        raise Exception("erp!")
 
     def repaint(self):
         # perhaps we should consolidate grobs?

pyrepl/pygame_keymap.py

@@ -90,22 +90,22 @@ def _parse_key1(key, s):
                 s += 2
             elif c == "c":
                 if key[s + 2] != '-':
-                    raise KeySpecError, \
+                    raise KeySpecError(
                               "\\C must be followed by `-' (char %d of %s)"%(
-                        s + 2, repr(key))
+                        s + 2, repr(key)))
                 if ctrl:
-                    raise KeySpecError, "doubled \\C- (char %d of %s)"%(
-                        s + 1, repr(key))
+                    raise KeySpecError("doubled \\C- (char %d of %s)"%(
+                        s + 1, repr(key)))
                 ctrl = 1
                 s += 3
             elif c == "m":
                 if key[s + 2] != '-':
-                    raise KeySpecError, \
+                    raise KeySpecError(
                               "\\M must be followed by `-' (char %d of %s)"%(
-                        s + 2, repr(key))
+                        s + 2, repr(key)))
                 if meta:
-                    raise KeySpecError, "doubled \\M- (char %d of %s)"%(
-                        s + 1, repr(key))
+                    raise KeySpecError("doubled \\M- (char %d of %s)"%(
+                        s + 1, repr(key)))
                 meta = 1
                 s += 3
             elif c.isdigit():
@@ -119,22 +119,22 @@ def _parse_key1(key, s):
             elif c == '<':
                 t = key.find('>', s)
                 if t == -1:
-                    raise KeySpecError, \
+                    raise KeySpecError(
                               "unterminated \\< starting at char %d of %s"%(
-                        s + 1, repr(key))
+                        s + 1, repr(key)))
                 try:
                     ret = _keynames[key[s+2:t].lower()]
                     s = t + 1
                 except KeyError:
-                    raise KeySpecError, \
+                    raise KeySpecError(
                               "unrecognised keyname `%s' at char %d of %s"%(
-                        key[s+2:t], s + 2, repr(key))
+                        key[s+2:t], s + 2, repr(key)))
                 if ret is None:
                     return None, s
             else:
-                raise KeySpecError, \
+                raise KeySpecError(
                           "unknown backslash escape %s at char %d of %s"%(
-                    `c`, s + 2, repr(key))
+                    repr(c), s + 2, repr(key)))
         else:
             if ctrl:
                 ret = chr(ord(key[s]) & 0x1f)   # curses.ascii.ctrl()
@@ -160,9 +160,9 @@ def _compile_keymap(keymap):
         r.setdefault(key[0], {})[key[1:]] = value
     for key, value in r.items():
         if value.has_key(()):
-            if len(value) <> 1:
-                raise KeySpecError, \
-                          "key definitions for %s clash"%(value.values(),)
+            if len(value) != 1:
+                raise KeySpecError(
+                          "key definitions for %s clash"%(value.values(),))
             else:
                 r[key] = value[()]
         else:
@@ -202,7 +202,7 @@ def unparse_key(keyseq):
         return ''
     name, s = keyname(keyseq)
     if name:
-        if name <> 'escape' or s == len(keyseq):
+        if name != 'escape' or s == len(keyseq):
             return '\\<' + name + '>' + unparse_key(keyseq[s:])
         else:
             return '\\M-' + unparse_key(keyseq[1:])
@@ -226,7 +226,7 @@ def _unparse_keyf(keyseq):
         return []
     name, s = keyname(keyseq)
     if name:
-        if name <> 'escape' or s == len(keyseq):
+        if name != 'escape' or s == len(keyseq):
             return [name] + _unparse_keyf(keyseq[s:])
         else:
             rest = _unparse_keyf(keyseq[1:])

pyrepl/python_reader.py

@@ -189,7 +189,7 @@ def execute(self, text):
             # ooh, look at the hack:
             code = self.compile(text, '<stdin>', 'single')
         except (OverflowError, SyntaxError, ValueError):
-            self.showsyntaxerror("<stdin>")
+            self.showsyntaxerror('<stdin>')
         else:
             self.runcode(code)
             if sys.stdout and not sys.stdout.closed: