| pulkit |
| hg-reviewers |
We're starting to write new utility scripts in Python 3, and I think
it's reasonable to expect python3 to be something we should use if
it's present. I wrote the regex to specifically ban Python 3 prior to
Python 3.5 because we won't ever support that.
I moved the only test that was using $PYTHON3 to just using python3
directly.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/hghave.py (2 lines) | |||
| M | tests/test-check-py3-compat.t (4 lines) |
| return ((not has_chg()) and os.environ.get('HGDEMANDIMPORT') != 'disable') | return ((not has_chg()) and os.environ.get('HGDEMANDIMPORT') != 'disable') | ||||
| @check("py3k", "running with Python 3.x") | @check("py3k", "running with Python 3.x") | ||||
| def has_py3k(): | def has_py3k(): | ||||
| return 3 == sys.version_info[0] | return 3 == sys.version_info[0] | ||||
| @check("py3exe", "a Python 3.x interpreter is available") | @check("py3exe", "a Python 3.x interpreter is available") | ||||
| def has_python3exe(): | def has_python3exe(): | ||||
| return 'PYTHON3' in os.environ | return matchoutput('python3 -V', br'^Python 3.(5|6|7|8|9)') | ||||
| @check("py3pygments", "Pygments available on Python 3.x") | @check("py3pygments", "Pygments available on Python 3.x") | ||||
| def has_py3pygments(): | def has_py3pygments(): | ||||
| if has_py3k(): | if has_py3k(): | ||||
| return has_pygments() | return has_pygments() | ||||
| elif has_python3exe(): | elif has_python3exe(): | ||||
| # just check exit status (ignoring output) | # just check exit status (ignoring output) | ||||
| py3 = os.environ['PYTHON3'] | py3 = os.environ['PYTHON3'] | ||||
| contrib/python-zstandard/tests/test_train_dictionary.py not using absolute_import | contrib/python-zstandard/tests/test_train_dictionary.py not using absolute_import | ||||
| setup.py not using absolute_import | setup.py not using absolute_import | ||||
| #if py3exe | #if py3exe | ||||
| $ testrepohg files 'set:(**.py) - grep(pygments)' \ | $ testrepohg files 'set:(**.py) - grep(pygments)' \ | ||||
| > -X hgdemandimport/demandimportpy2.py \ | > -X hgdemandimport/demandimportpy2.py \ | ||||
| > -X hgext/fsmonitor/pywatchman \ | > -X hgext/fsmonitor/pywatchman \ | ||||
| > -X mercurial/thirdparty/cbor \ | > -X mercurial/thirdparty/cbor \ | ||||
| > | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py \ | > | sed 's|\\|/|g' | xargs python3 contrib/check-py3-compat.py \ | ||||
| > | sed 's/[0-9][0-9]*)$/*)/' | > | sed 's/[0-9][0-9]*)$/*)/' | ||||
| contrib/python-zstandard/setup.py not using absolute_import | contrib/python-zstandard/setup.py not using absolute_import | ||||
| contrib/python-zstandard/setup_zstd.py not using absolute_import | contrib/python-zstandard/setup_zstd.py not using absolute_import | ||||
| contrib/python-zstandard/tests/common.py not using absolute_import | contrib/python-zstandard/tests/common.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_buffer_util.py not using absolute_import | contrib/python-zstandard/tests/test_buffer_util.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_compressor.py not using absolute_import | contrib/python-zstandard/tests/test_compressor.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_compressor_fuzzing.py not using absolute_import | contrib/python-zstandard/tests/test_compressor_fuzzing.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_data_structures.py not using absolute_import | contrib/python-zstandard/tests/test_data_structures.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_data_structures_fuzzing.py not using absolute_import | contrib/python-zstandard/tests/test_data_structures_fuzzing.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_decompressor.py not using absolute_import | contrib/python-zstandard/tests/test_decompressor.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_decompressor_fuzzing.py not using absolute_import | contrib/python-zstandard/tests/test_decompressor_fuzzing.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_estimate_sizes.py not using absolute_import | contrib/python-zstandard/tests/test_estimate_sizes.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_module_attributes.py not using absolute_import | contrib/python-zstandard/tests/test_module_attributes.py not using absolute_import | ||||
| contrib/python-zstandard/tests/test_train_dictionary.py not using absolute_import | contrib/python-zstandard/tests/test_train_dictionary.py not using absolute_import | ||||
| setup.py not using absolute_import | setup.py not using absolute_import | ||||
| #endif | #endif | ||||
| #if py3exe py3pygments | #if py3exe py3pygments | ||||
| $ testrepohg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \ | $ testrepohg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \ | ||||
| > | xargs $PYTHON3 contrib/check-py3-compat.py \ | > | xargs python3 contrib/check-py3-compat.py \ | ||||
| > | sed 's/[0-9][0-9]*)$/*)/' | > | sed 's/[0-9][0-9]*)$/*)/' | ||||
| #endif | #endif | ||||