##// END OF EJS Templates
statichttprepo: fix `httprangereader.read()` for py3...
statichttprepo: fix `httprangereader.read()` for py3 It looks like there were a bunch of problems, not all of them py3 related: 1) The signature of BinaryIO.read() is -1, not None 2) The `end` variable can't be bytes and interpolate into str with "%s" 3) The `end` variable can't be an int and interpolate into str with "%s" 4) The result slicing could be out of bounds if more is requested than returned I guess if somebody would have called `read(-1)` (either directly or because a wrapper defaults to that), it wouldn't have been handled correctly. The fact that it is a valid value meaning to read everything requires some additional changes later in the method around when it slices the byte string that was read, but that seems to have already been broken.

File last commit:

r52756:f4733654 default
r52792:e26a0856 default
Show More
policy.py
160 lines | 5.0 KiB | text/x-python | PythonLexer
timeless
debuginstall: expose modulepolicy...
r29266 # policy.py - module policy logic for Mercurial.
#
# 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.
Matt Harbison
typing: add `from __future__ import annotations` to most files...
r52756 from __future__ import annotations
timeless
debuginstall: expose modulepolicy...
r29266
import os
import sys
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 import typing
if typing.TYPE_CHECKING:
from typing import (
Dict,
Optional,
Tuple,
)
timeless
debuginstall: expose modulepolicy...
r29266
# Rules for how modules can be loaded. Values are:
#
# c - require C extensions
Georges Racinet
rust: module policy with importrust...
r42651 # rust+c - require Rust and C extensions
# rust+c-allow - allow Rust and C extensions with fallback to pure Python
# for each
timeless
debuginstall: expose modulepolicy...
r29266 # allow - allow pure Python implementation when C loading fails
Maciej Fijalkowski
policy: add cffi policy for PyPy...
r29490 # cffi - required cffi versions (implemented within pure module)
# cffi-allow - allow pure Python implementation if cffi version is missing
timeless
debuginstall: expose modulepolicy...
r29266 # py - only load pure Python modules
#
Yuya Nishihara
policy: relax the default for in-place build...
r32251 # By default, fall back to the pure modules so the in-place build can
# run without recompiling the C extensions. This will be overridden by
# __modulepolicy__ generated by setup.py.
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 policy: bytes = b'allow'
_packageprefs: "Dict[bytes, Tuple[Optional[str], Optional[str]]]" = {
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 # policy: (versioned package, pure package)
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 b'c': ('cext', None),
b'allow': ('cext', 'pure'),
b'cffi': ('cffi', None),
b'cffi-allow': ('cffi', 'pure'),
b'py': (None, 'pure'),
Georges Racinet
rust: module policy with importrust...
r42651 # For now, rust policies impact importrust only
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 b'rust+c': ('cext', None),
b'rust+c-allow': ('cext', 'pure'),
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 }
Maciej Fijalkowski
policy: add cffi policy for PyPy...
r29490
timeless
debuginstall: expose modulepolicy...
r29266 try:
Matt Harbison
typing: narrow the scope of some recent disabled import warnings...
r52624 from . import __modulepolicy__ # pytype: disable=import-error
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 policy: bytes = __modulepolicy__.modulepolicy
timeless
debuginstall: expose modulepolicy...
r29266 except ImportError:
pass
# PyPy doesn't load C extensions.
#
# The canonical way to do this is to test platform.python_implementation().
# But we don't import platform and don't bloat for it here.
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 if '__pypy__' in sys.builtin_module_names:
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 policy: bytes = b'cffi'
timeless
debuginstall: expose modulepolicy...
r29266
# Environment variable can always force settings.
Gregory Szorc
policy: remove Python 2.7 compatibility code...
r49793 if 'HGMODULEPOLICY' in os.environ:
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 policy: bytes = os.environ['HGMODULEPOLICY'].encode('utf-8')
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 def _importfrom(pkgname: str, modname: str):
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 # from .<pkgname> import <modname> (where . is looked through this module)
fakelocals = {}
pkg = __import__(pkgname, globals(), fakelocals, [modname], level=1)
try:
fakelocals[modname] = mod = getattr(pkg, modname)
except AttributeError:
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 raise ImportError('cannot import name %s' % modname)
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 # force import; fakelocals[modname] may be replaced with the real module
Gregory Szorc
py3: stop normalizing 2nd argument of *attr() to unicode...
r43373 getattr(mod, '__doc__', None)
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 return fakelocals[modname]
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
policy: define C module versions individually...
r32428 # keep in sync with "version" in C modules
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 _cextversions: "Dict[Tuple[str, str], int]" = {
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 ('cext', 'base85'): 1,
('cext', 'bdiff'): 3,
('cext', 'mpatch'): 1,
('cext', 'osutil'): 4,
Raphaël Gomès
dirstate-entry: add `modified` property...
r50715 ('cext', 'parsers'): 21,
Jun Wu
policy: define C module versions individually...
r32428 }
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 # map import request to other package or module
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 _modredirects: "Dict[Tuple[str, str], Tuple[str, str]]" = {
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 ('cext', 'charencode'): ('cext', 'parsers'),
('cffi', 'base85'): ('pure', 'base85'),
('cffi', 'charencode'): ('pure', 'charencode'),
('cffi', 'parsers'): ('pure', 'parsers'),
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 }
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 def _checkmod(pkgname: str, modname: str, mod) -> None:
Yuya Nishihara
policy: extend API version checks for cffi...
r32511 expected = _cextversions.get((pkgname, modname))
Gregory Szorc
py3: stop normalizing 2nd argument of *attr() to unicode...
r43373 actual = getattr(mod, 'version', None)
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 if actual != expected:
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 raise ImportError(
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 'cannot import module %s.%s '
'(expected version: %d, actual: %r)'
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 % (pkgname, modname, expected, actual)
)
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 def importmod(modname: str):
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 """Import module according to policy and check API version"""
try:
verpkg, purepkg = _packageprefs[policy]
except KeyError:
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 raise ImportError('invalid HGMODULEPOLICY %r' % policy)
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 assert verpkg or purepkg
if verpkg:
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 pn, mn = _modredirects.get((verpkg, modname), (verpkg, modname))
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 try:
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 mod = _importfrom(pn, mn)
if pn == verpkg:
_checkmod(pn, mn, mod)
Yuya Nishihara
policy: add helper to import cext/pure module...
r32366 return mod
except ImportError:
if not purepkg:
raise
Yuya Nishihara
policy: reroute proxy modules internally...
r33755 pn, mn = _modredirects.get((purepkg, modname), (purepkg, modname))
return _importfrom(pn, mn)
Georges Racinet
rust: module policy with importrust...
r42651
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 def _isrustpermissive() -> bool:
Georges Racinet
rust: module policy with importrust...
r42651 """Assuming the policy is a Rust one, tell if it's permissive."""
return policy.endswith(b'-allow')
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Matt Harbison
typing: add type hints to `mercurial.policy`...
r52617 def importrust(modname: str, member: "Optional[str]" = None, default=None):
Georges Racinet
rust: module policy with importrust...
r42651 """Import Rust module according to policy and availability.
If policy isn't a Rust one, this returns `default`.
If either the module or its member is not available, this returns `default`
if policy is permissive and raises `ImportError` if not.
"""
if not policy.startswith(b'rust'):
return default
try:
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 mod = _importfrom('rustext', modname)
Georges Racinet
rust: module policy with importrust...
r42651 except ImportError:
if _isrustpermissive():
return default
raise
if member is None:
return mod
try:
return getattr(mod, member)
except AttributeError:
if _isrustpermissive():
return default
Augie Fackler
cleanup: remove pointless r-prefixes on double-quoted strings...
r43809 raise ImportError("Cannot import name %s" % member)