Mercurial > hg
view contrib/python3-ratchet.py @ 45755:8ed69bd42f10 stable
demandimport: don't raise AttributeError if `exec_module` is missing
I assume this was meant to do the check gracefully. After shoveling a bunch of
modules into the ignore list in order to get keyring to work out of the box on
CentOS 8, I hit the following error accessing the password, which the change
fixes. Now the SecretStorage backend works out of the box, without any edits to
the ignore list.
** Unknown exception encountered with possibly-broken third-party extension mercurial_keyring
** which supports versions unknown of Mercurial.
** Please disable mercurial_keyring and try your action again.
** If that fixes the bug please report it to https://foss.heptapod.net/mercurial/mercurial_keyring/issues
** Python 3.6.8 (default, Apr 16 2020, 01:36:27) [GCC 8.3.1 20191121 (Red Hat 8.3.1-5)]
** Mercurial Distributed SCM (version 5.5.2)
** Extensions loaded: evolve, topic, rebase, absorb, mercurial_keyring
Traceback (most recent call last):
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/mercurial_keyring.py", line 230, in _read_password_from_keyring
password = keyring.get_password(KEYRING_SERVICE, pwdkey)
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/keyring/core.py", line 53, in get_password
return _keyring_backend.get_password(service_name, username)
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/keyring/backends/chainer.py", line 51, in get_password
password = keyring.get_password(service, username)
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/keyring/backends/SecretService.py", line 79, in get_password
return item.get_secret().decode('utf-8')
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/secretstorage/item.py", line 105, in get_secret
decryptor = Cipher(aes, modes.CBC(aes_iv), default_backend()).decryptor()
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/cryptography/hazmat/backends/__init__.py", line 15, in default_backend
from cryptography.hazmat.backends.openssl.backend import backend
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/hgdemandimport/demandimportpy3.py", line 53, in exec_module
self.loader.exec_module(module)
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/cryptography/hazmat/backends/openssl/__init__.py", line 7, in <module>
from cryptography.hazmat.backends.openssl.backend import backend
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 955, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 665, in _load_unlocked
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/hgdemandimport/demandimportpy3.py", line 53, in exec_module
self.loader.exec_module(module)
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/cryptography/hazmat/backends/openssl/backend.py", line 14, in <module>
from six.moves import range
File "<frozen importlib._bootstrap>", line 971, in _find_and_load
File "<frozen importlib._bootstrap>", line 951, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 894, in _find_spec
File "/home/mharbison/hg_py3.6.8_venv/lib64/python3.6/site-packages/hgdemandimport/demandimportpy3.py", line 117, in find_spec
and getattr(spec.loader, "exec_module")
AttributeError: '_SixMetaPathImporter' object has no attribute 'exec_module'
Differential Revision: https://phab.mercurial-scm.org/D9243
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 22 Oct 2020 18:38:41 -0400 |
parents | 9f70512ae2cf |
children | 89a2afe31e82 |
line wrap: on
line source
# Copyright 2012 Facebook # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """Find tests that newly pass under Python 3. The approach is simple: we maintain a whitelist of Python 3 passing tests in the repository, and periodically run all the /other/ tests and look for new passes. Any newly passing tests get automatically added to the whitelist. You probably want to run it like this: $ cd tests $ python3 ../contrib/python3-ratchet.py \ > --working-tests=../contrib/python3-whitelist """ from __future__ import print_function from __future__ import absolute_import import argparse import json import os import subprocess import sys _hgenv = dict(os.environ) _hgenv.update( {'HGPLAIN': '1',} ) _HG_FIRST_CHANGE = '9117c6561b0bd7792fa13b50d28239d51b78e51f' def _runhg(*args): return subprocess.check_output(args, env=_hgenv) def _is_hg_repo(path): return ( _runhg('hg', 'log', '-R', path, '-r0', '--template={node}').strip() == _HG_FIRST_CHANGE ) def _py3default(): if sys.version_info[0] >= 3: return sys.executable return 'python3' def main(argv=()): p = argparse.ArgumentParser() p.add_argument( '--working-tests', help='List of tests that already work in Python 3.' ) p.add_argument( '--commit-to-repo', help='If set, commit newly fixed tests to the given repo', ) p.add_argument( '-j', default=os.sysconf('SC_NPROCESSORS_ONLN'), type=int, help='Number of parallel tests to run.', ) p.add_argument( '--python3', default=_py3default(), help='python3 interpreter to use for test run', ) p.add_argument( '--commit-user', default='python3-ratchet@mercurial-scm.org', help='Username to specify when committing to a repo.', ) opts = p.parse_args(argv) if opts.commit_to_repo: if not _is_hg_repo(opts.commit_to_repo): print('abort: specified repository is not the hg repository') sys.exit(1) if not opts.working_tests or not os.path.isfile(opts.working_tests): print( 'abort: --working-tests must exist and be a file (got %r)' % opts.working_tests ) sys.exit(1) elif opts.commit_to_repo: root = _runhg('hg', 'root').strip() if not opts.working_tests.startswith(root): print( 'abort: if --commit-to-repo is given, ' '--working-tests must be from that repo' ) sys.exit(1) try: subprocess.check_call( [ opts.python3, '-c', 'import sys ; ' 'assert ((3, 5) <= sys.version_info < (3, 6) ' 'or sys.version_info >= (3, 6, 2))', ] ) except subprocess.CalledProcessError: print( 'warning: Python 3.6.0 and 3.6.1 have ' 'a bug which breaks Mercurial' ) print('(see https://bugs.python.org/issue29714 for details)') sys.exit(1) rt = subprocess.Popen( [ opts.python3, 'run-tests.py', '-j', str(opts.j), '--blacklist', opts.working_tests, '--json', ] ) rt.wait() with open('report.json') as f: data = f.read() report = json.loads(data.split('=', 1)[1]) newpass = set() for test, result in report.items(): if result['result'] != 'success': continue # A new passing test! Huzzah! newpass.add(test) if newpass: # We already validated the repo, so we can just dive right in # and commit. if opts.commit_to_repo: print(len(newpass), 'new passing tests on Python 3!') with open(opts.working_tests) as f: oldpass = {l for l in f.read().splitlines() if l} with open(opts.working_tests, 'w') as f: for p in sorted(oldpass | newpass): f.write('%s\n' % p) _runhg( 'hg', 'commit', '-R', opts.commit_to_repo, '--user', opts.commit_user, '--message', 'python3: expand list of passing tests', ) else: print('Newly passing tests:', '\n'.join(sorted(newpass))) sys.exit(2) if __name__ == '__main__': main(sys.argv[1:])