Skip to content
Snippets Groups Projects
Commit e2c086f147ef authored by Augie Fackler's avatar Augie Fackler
Browse files

py3: split check of pygments-using files from the rest of the tree

If we don't do this, people without pygments installed in their Python
3 environment silently stop checking test-check-py3-compat, which
isn't really what we wanted. This preserves stability of the test
output while still letting anyone with a recent-enough Python 3 run
the majority of the Python 3 compat checking test.
parent 42751543fa06
No related branches found
No related tags found
No related merge requests found
......@@ -12,8 +12,8 @@
setup.py not using absolute_import
tests/test-demandimport.py not using absolute_import
#if py3exe py3pygments
$ hg files 'set:(**.py)' | sed 's|\\|/|g' \
#if py3exe
$ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \
> | xargs $PYTHON3 contrib/check-py3-compat.py \
> | sed 's/[0-9][0-9]*)$/*)/'
doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *)
......@@ -50,7 +50,6 @@
hgext/gpg.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*)
hgext/graphlog.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*)
hgext/hgk.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*)
hgext/highlight/highlight.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*)
hgext/histedit.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*)
hgext/journal.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*)
hgext/keyword.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*)
......@@ -172,3 +171,10 @@
mercurial/wireproto.py: error importing module: <TypeError> unorderable types: str() >= tuple() (line *)
#endif
#if py3exe py3pygments
$ hg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \
> | xargs $PYTHON3 contrib/check-py3-compat.py \
> | sed 's/[0-9][0-9]*)$/*)/'
hgext/highlight/highlight.py: error importing: <TypeError> str expected, not bytes (error at encoding.py:*)
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment