Merge pull request #1 from blueyed/ci

ci: Travis

Author: blueyed

.travis.yml

@@ -0,0 +1,44 @@
+dist: xenial
+language: python
+
+env:
+  global:
+    - PYTEST_ADDOPTS="--cov --cov-report=xml"
+
+jobs:
+  include:
+    - python: '2.7'
+      env: TOXENV=py27-coverage
+    - python: '3.4'
+      env: TOXENV=py34-coverage
+    - python: '3.5'
+      env: TOXENV=py35-coverage
+    - python: '3.6'
+      env: TOXENV=py36-coverage
+    - python: '3.7'
+      env: TOXENV=py37-coverage
+    - python: 'pypy2.7-6.0'
+      env: TOXENV=pypy-coverage
+    - python: 'pypy3.5-6.0'
+      env: TOXENV=pypy3-coverage
+    # Fails currently badly.
+    # - python: '3.7'
+    #   env: TOXENV=qa
+
+install:
+  - pip install tox
+
+script:
+  - tox
+
+after_script:
+  - |
+    if [[ "${TOXENV%-coverage}" != "$TOXENV" ]]; then
+      bash <(curl -s https://codecov.io/bash) -Z -X gcov -X coveragepy -X search -X xcode -X gcovout -X fix -f coverage.xml -n $TOXENV
+    fi
+
+# Only master and releases.  PRs are used otherwise.
+branches:
+  only:
+    - master
+    - /^\d+\.\d+(\.\d+)?(-\S*)?$/

pyrepl/_minimal_curses.py

@@ -17,7 +17,7 @@ class error(Exception):
 
 
 def _find_clib():
-    trylibs = ['ncurses', 'curses']
+    trylibs = ['ncursesw', 'ncurses', 'curses']
 
     for lib in trylibs:
         path = ctypes.util.find_library(lib)

pyrepl/completing_reader.py

@@ -65,8 +65,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 = cons.width / (maxlen + padding)
-    rows = (len(wordlist) - 1)/cols + 1
+    cols = int(cons.width / (maxlen + padding))
+    rows = int((len(wordlist) - 1)/cols + 1)
 
     if sort_in_column:
         # sort_in_column=False (default)     sort_in_column=True

pyrepl/input.py

@@ -36,7 +36,7 @@
 import unicodedata
 from collections import deque
 import pprint
-from trace import trace
+from .trace import trace
 
 
 class InputTranslator(object):

pyrepl/readline.py

@@ -32,6 +32,14 @@
 from pyrepl.historical_reader import HistoricalReader
 from pyrepl.completing_reader import CompletingReader
 from pyrepl.unix_console import UnixConsole, _error
+try:
+    unicode
+    PY3 = False
+except NameError:
+    PY3 = True
+    unicode = str
+    unichr = chr
+    basestring = bytes, str
 
 
 ENCODING = sys.getfilesystemencoding() or 'latin1'     # XXX review
@@ -199,7 +207,14 @@ def raw_input(self, prompt=''):
         except _error:
             return _old_raw_input(prompt)
         reader.ps1 = prompt
-        return reader.readline(startup_hook=self.startup_hook)
+
+        ret = reader.readline(startup_hook=self.startup_hook)
+        if not PY3:
+            return ret
+
+        # Unicode/str is required for Python 3 (3.5.2).
+        # Ref: https://bitbucket.org/pypy/pyrepl/issues/20/#comment-30647029
+        return unicode(ret, ENCODING)
 
     def multiline_input(self, more_lines, ps1, ps2, returns_unicode=False):
         """Read an input on possibly multiple lines, asking for more
@@ -229,12 +244,15 @@ def set_completer_delims(self, string):
         self.config.completer_delims = dict.fromkeys(string)
 
     def get_completer_delims(self):
-        chars = self.config.completer_delims.keys()
+        chars = list(self.config.completer_delims.keys())
         chars.sort()
         return ''.join(chars)
 
     def _histline(self, line):
         line = line.rstrip('\n')
+        if PY3:
+            return line
+
         try:
             return unicode(line, ENCODING)
         except UnicodeDecodeError:   # bah, silently fall back...
@@ -423,9 +441,14 @@ def _old_raw_input(prompt=''):
 
     else:
         # this is not really what readline.c does.  Better than nothing I guess
-        import __builtin__
-        _old_raw_input = __builtin__.raw_input
-        __builtin__.raw_input = _wrapper.raw_input
+        try:
+            import __builtin__
+            _old_raw_input = __builtin__.raw_input
+            __builtin__.raw_input = _wrapper.raw_input
+        except ImportError:
+            import builtins
+            _old_raw_input = builtins.input
+            builtins.input = _wrapper.raw_input
 
 _old_raw_input = None
 _setup()

pyrepl/simple_interact.py

@@ -44,8 +44,11 @@ def run_multiline_interactive_console(mainmodule=None, future_flags=0):
         console.compile.compiler.flags |= future_flags
 
     def more_lines(unicodetext):
-        # ooh, look at the hack:
-        src = "#coding:utf-8\n"+unicodetext.encode('utf-8')
+        if sys.version_info < (3, ):
+            # ooh, look at the hack:
+            src = "#coding:utf-8\n"+unicodetext.encode('utf-8')
+        else:
+            src = unicodetext
         try:
             code = console.compile(src, '<stdin>', 'single')
         except (OverflowError, SyntaxError, ValueError):

pyrepl/unix_eventqueue.py

@@ -65,11 +65,11 @@
 #
 CTRL_ARROW_KEYCODE = {
     # for xterm, gnome-terminal, xfce terminal, etc.
-    '\033[1;5D': 'ctrl left',
-    '\033[1;5C': 'ctrl right',
+    b'\033[1;5D': 'ctrl left',
+    b'\033[1;5C': 'ctrl right',
     # for rxvt
-    '\033Od': 'ctrl left',
-    '\033Oc': 'ctrl right',
+    b'\033Od': 'ctrl left',
+    b'\033Oc': 'ctrl right',
 }
 
 def general_keycodes():
@@ -120,6 +120,7 @@ def insert(self, event):
 
     def push(self, char):
         ord_char = char if isinstance(char, int) else ord(char)
+        char = bytes(bytearray((ord_char,)))
         self.buf.append(ord_char)
         if char in self.k:
             if self.k is self.ck:
@@ -133,13 +134,13 @@ def push(self, char):
                 self.insert(Event('key', k, self.flush_buf()))
                 self.k = self.ck
 
-        elif self.buf and self.buf[0] == 033: # 033 == escape
+        elif self.buf and self.buf[0] == 27:  # escape
             # escape sequence not recognized by our keymap: propagate it
             # outside so that i can be recognized as an M-... key (see also
             # the docstring in keymap.py, in particular the line \\E.
             trace('unrecognized escape sequence, propagating...')
             self.k = self.ck
-            self.insert(Event('key', '\033', '\033'))
+            self.insert(Event('key', '\033', bytearray(b'\033')))
             for c in self.flush_buf()[1:]:
                 self.push(chr(c))
 

testing/test_functional.py

@@ -7,7 +7,8 @@
 import sys
 
 
-def pytest_funcarg__child(request):
+@pytest.fixture
+def child(request):
     try:
         pexpect = pytest.importorskip('pexpect')
     except SyntaxError:

testing/test_readline.py

@@ -1,11 +1,20 @@
-from pyrepl.readline import _ReadlineWrapper
 import os
 import pty
 import sys
 
+import pytest
+from pyrepl.readline import _ReadlineWrapper
+
+
+@pytest.fixture
+def readline_wrapper():
+    master, slave = pty.openpty()
+    return _ReadlineWrapper(slave, slave)
+
+
 if sys.version_info < (3, ):
     bytes_type = str
-    unicode_type = unicode
+    unicode_type = unicode  # noqa: F821
 else:
     bytes_type = bytes
     unicode_type = str
@@ -37,5 +46,23 @@ def test_raw_input():
     os.write(master, b'input\n')
 
     result = readline_wrapper.raw_input('prompt:')
-    assert result == b'input'
-    assert isinstance(result, bytes_type)
+    if sys.version_info < (3, ):
+        assert result == b'input'
+        assert isinstance(result, bytes_type)
+    else:
+        assert result == 'input'
+        assert isinstance(result, unicode_type)
+
+
+def test_read_history_file(readline_wrapper, tmp_path):
+    histfile = tmp_path / "history"
+    histfile.touch()
+
+    assert readline_wrapper.reader is None
+
+    readline_wrapper.read_history_file(str(histfile))
+    assert readline_wrapper.reader.history == []
+
+    histfile.write_bytes(b"foo\nbar\n")
+    readline_wrapper.read_history_file(str(histfile))
+    assert readline_wrapper.reader.history == ["foo", "bar"]

tox.ini

@@ -1,17 +1,34 @@
 [tox]
-envlist = py27, py33, flake8, pypy
-
-
+envlist = py{27,34,35,36,37,py,py3}, flake8
 
 [testenv]
-deps=
+deps =
     pytest
     pexpect
-commands=
-    py.test --junitxml={envdir}/junit.xml []
+    coverage: pytest-cov
+commands =
+    pytest {posargs}
+passenv =
+    TERM
+setenv =
+    coverage: PYTEST_ADDOPTS=--cov {env:PYTEST_ADDOPTS:}
 
-[testenv:flake8]
+[testenv:qa]
 deps =
     flake8
     mccabe
 commands = flake8 --max-complexity=10 setup.py pyrepl testing pythoni pythoni1
+
+[pytest]
+testpaths = testing
+
+[coverage:run]
+include = pyrepl/*, testing/*
+parallel = 1
+branch = 1
+
+[coverage:paths]
+source = pyrepl/
+  */lib/python*/site-packages/pyrepl/
+  */pypy*/site-packages/pyrepl/
+  *\Lib\site-packages\pyrepl\