##// END OF EJS Templates
bundle1: fix bundle1-denied reporting for push over ssh...
bundle1: fix bundle1-denied reporting for push over ssh Changeset b288fb2724bf introduced a config option to have the server deny push using bundle1. The original protocol has not really be design to allow such kind of error reporting so some hack was used. It turned the hack only works on HTTP and that ssh wire peer hangs forever when the same hack is used. After further digging, there is no way to report the error in a unified way. Using 'ooberror' freeze ssh and raising 'Abort' makes HTTP return a HTTP500 without further details. So with sadness we implement a version that dispatch according to the protocol used. We also add a test for pushing over ssh to make sure we won't regress in the future. That test show that the hint is missing, this is another bug fixed in the next changeset.

File last commit:

r30117:b85fa6bf default
r30909:d554e624 stable
Show More
check-py3-compat.py
95 lines | 3.2 KiB | text/x-python | PythonLexer
/ contrib / check-py3-compat.py
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279 #!/usr/bin/env python
#
# check-py3-compat - check Python 3 compatibility of Mercurial files
#
# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import, print_function
import ast
Gregory Szorc
tests: try to import modules with Python 3...
r28584 import os
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279 import sys
Gregory Szorc
tests: try to import modules with Python 3...
r28584 import traceback
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279
Gregory Szorc
tests: perform an ast parse with Python 3...
r28583 def check_compat_py2(f):
"""Check Python 3 compatibility for a file with Python 2"""
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279 with open(f, 'rb') as fh:
content = fh.read()
Yuya Nishihara
test: make check-py3-compat.py ignore empty code more reliably...
r28475 root = ast.parse(content)
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279
Gregory Szorc
contrib: ignore empty files in check-py3-compat.py
r27331 # Ignore empty files.
Yuya Nishihara
test: make check-py3-compat.py ignore empty code more reliably...
r28475 if not root.body:
Gregory Szorc
contrib: ignore empty files in check-py3-compat.py
r27331 return
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279 futures = set()
haveprint = False
for node in ast.walk(root):
if isinstance(node, ast.ImportFrom):
if node.module == '__future__':
futures |= set(n.name for n in node.names)
elif isinstance(node, ast.Print):
haveprint = True
if 'absolute_import' not in futures:
print('%s not using absolute_import' % f)
if haveprint and 'print_function' not in futures:
print('%s requires print_function' % f)
Gregory Szorc
tests: perform an ast parse with Python 3...
r28583 def check_compat_py3(f):
"""Check Python 3 compatibility of a file with Python 3."""
Yuya Nishihara
py3: make check-py3-compat.py import importlib only if necessary...
r30117 import importlib # not available on Python 2.6
Gregory Szorc
tests: perform an ast parse with Python 3...
r28583 with open(f, 'rb') as fh:
content = fh.read()
try:
ast.parse(content)
except SyntaxError as e:
print('%s: invalid syntax: %s' % (f, e))
return
Gregory Szorc
tests: try to import modules with Python 3...
r28584 # Try to import the module.
# For now we only support mercurial.* and hgext.* modules because figuring
# out module paths for things not in a package can be confusing.
if f.startswith(('hgext/', 'mercurial/')) and not f.endswith('__init__.py'):
assert f.endswith('.py')
FUJIWARA Katsunori
py3: make check-py3-compat.py use correct module name at loading pure modules...
r29751 name = f.replace('/', '.')[:-3].replace('.pure.', '.')
Yuya Nishihara
py3: remove superfluous indent from check-py3-compat.py
r30095 try:
importlib.import_module(name)
except Exception as e:
exc_type, exc_value, tb = sys.exc_info()
# We walk the stack and ignore frames from our custom importer,
# import mechanisms, and stdlib modules. This kinda/sorta
# emulates CPython behavior in import.c while also attempting
# to pin blame on a Mercurial file.
for frame in reversed(traceback.extract_tb(tb)):
if frame.name == '_call_with_frames_removed':
continue
if 'importlib' in frame.filename:
continue
if 'mercurial/__init__.py' in frame.filename:
continue
if frame.filename.startswith(sys.prefix):
continue
break
Gregory Szorc
tests: try to import modules with Python 3...
r28584
Yuya Nishihara
py3: remove superfluous indent from check-py3-compat.py
r30095 if frame.filename:
filename = os.path.basename(frame.filename)
print('%s: error importing: <%s> %s (error at %s:%d)' % (
f, type(e).__name__, e, filename, frame.lineno))
else:
print('%s: error importing module: <%s> %s (line %d)' % (
f, type(e).__name__, e, frame.lineno))
Gregory Szorc
tests: try to import modules with Python 3...
r28584
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279 if __name__ == '__main__':
Gregory Szorc
tests: perform an ast parse with Python 3...
r28583 if sys.version_info[0] == 2:
fn = check_compat_py2
else:
fn = check_compat_py3
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279 for f in sys.argv[1:]:
Gregory Szorc
tests: perform an ast parse with Python 3...
r28583 fn(f)
Gregory Szorc
tests: add test for Python 3 compatibility...
r27279
sys.exit(0)