Mercurial > hg
changeset 29809:7025693433b2
py3: have check-py3-compat require pygments to get stable result
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 17 Aug 2016 20:52:50 +0900 |
| parents | 8d226db31f20 |
| children | ceff91dea404 |
| files | tests/hghave.py tests/test-check-py3-compat.t |
| diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/hghave.py Tue Aug 09 17:06:35 2016 +0200 +++ b/tests/hghave.py Wed Aug 17 20:52:50 2016 +0900 @@ -544,6 +544,16 @@ def has_python3exe(): return 'PYTHON3' in os.environ +@check("py3pygments", "Pygments available on Python 3.x") +def has_py3pygments(): + if has_py3k(): + return has_pygments() + elif has_python3exe(): + # just check exit status (ignoring output) + py3 = os.environ['PYTHON3'] + return matchoutput('%s -c "import pygments"' % py3, br'') + return False + @check("pure", "running with pure Python code") def has_pure(): return any([
--- a/tests/test-check-py3-compat.t Tue Aug 09 17:06:35 2016 +0200 +++ b/tests/test-check-py3-compat.t Wed Aug 17 20:52:50 2016 +0900 @@ -12,7 +12,7 @@ setup.py not using absolute_import tests/test-demandimport.py not using absolute_import -#if py3exe +#if py3exe py3pygments $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) hgext/acl.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) (glob) @@ -48,7 +48,7 @@ hgext/gpg.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) (glob) hgext/graphlog.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) (glob) hgext/hgk.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) (glob) - hgext/highlight/highlight.py: error importing module: <ImportError> No module named 'pygments' (line 13) + hgext/highlight/highlight.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) (glob) hgext/histedit.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) (glob) hgext/journal.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) (glob) hgext/keyword.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*) (glob)