This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7702

pyoxidizer: don't expect `fp.name` to exist on object from `resources`
AbandonedPublic

Authored by martinvonz on Dec 18 2019, 5:30 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Summary

importlib.resources.open_resource() in pyoxidizer returns a
_io.BytesIO, which does not have a name attribute.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Dec 18 2019, 5:30 PM
indygreg accepted this revision.Dec 18 2019, 9:05 PM
indygreg added a subscriber: indygreg.

Yay - more undefined behavior regarding the importlib.resources interface!

This revision is now accepted and ready to land.Dec 18 2019, 9:05 PM
martinvonz abandoned this revision.Dec 19 2019, 12:42 AM

What this was fixing was not yet accepted -- it's in D7629. I've reordered the patches now and this on is no longer needed.

Revision Contents
Changeset List

PathPackages
Mmercurial/rcutil.py (3 lines)

Diff 18869

mercurial/rcutil.py

_rccomponents.extend((b'path', p) for p in _expandrcpath(p)) _rccomponents.extend((b'path', p) for p in _expandrcpath(p))
else: else:
default_entries = [] default_entries = []
for name in resourceutil.list_resources(b'defaultrc'): for name in resourceutil.list_resources(b'defaultrc'):
if not name.endswith(b'.rc'): if not name.endswith(b'.rc'):
continue continue
with resourceutil.open_resource(b'defaultrc', name) as fp: with resourceutil.open_resource(b'defaultrc', name) as fp:
cfg = config.config() cfg = config.config()
cfg.read(pycompat.sysbytes(fp.name), fp=fp) source = util.getattr(fp, 'name', b'<internal>/' + name)
cfg.read(pycompat.sysbytes(source), fp=fp)
for section in cfg: for section in cfg:
for name, value in cfg.items(section): for name, value in cfg.items(section):
source = cfg.source(section, name) source = cfg.source(section, name)
default_entries.append((section, name, value, source)) default_entries.append((section, name, value, source))
_rccomponents = [(b'items', default_entries)] _rccomponents = [(b'items', default_entries)]
normpaths = lambda paths: [ normpaths = lambda paths: [
(b'path', os.path.normpath(p)) for p in paths (b'path', os.path.normpath(p)) for p in paths