This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7701

resourceutil: use `from importlib import resources`
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG75ec46c63657: resourceutil: use `from importlib import resources`
Summary

Without this patch, we get the following error from when trying to run
hg with PyOxidizer:

module 'importlib' has no attribute 'resources'

I don't know what why that happens, but `from importlib import
resources` is the form I would prefer anyway, so let's use that now
that the impoort-checker has been fixed.

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:04 PM
indygreg added a subscriber: indygreg.

That's a weird error for PyOxidizer! I'm not sure why it would be happening either.

This revision is now accepted and ready to land.Dec 18 2019, 9:04 PM
indygreg requested changes to this revision.Dec 18 2019, 9:06 PM

This patch doesn't apply cleanly. Could you please take a look @martinvonz.

This revision now requires changes to proceed.Dec 18 2019, 9:06 PM
martinvonz added a comment.Dec 19 2019, 12:44 AM
In D7701#113332, @indygreg wrote:

This patch doesn't apply cleanly. Could you please take a look @martinvonz.

To be clear, it didn't come directly from PyOxidizer. I instrumented resourceutil.py to print the ImportError that was raised and that is what that error was.

indygreg accepted this revision.Dec 23 2019, 12:17 PM
This revision is now accepted and ready to land.Dec 23 2019, 12:17 PM
martinvonz added a commit: rHG75ec46c63657: resourceutil: use `from importlib import resources`.Dec 23 2019, 12:27 PM
Closed by commit rHG75ec46c63657: resourceutil: use `from importlib import resources` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/resourceutil.py (12 lines)

Diff 18868

mercurial/utils/resourceutil.py

# the location of data files matching the source code # the location of data files matching the source code
if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app': if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
# executable version (py2exe) doesn't support __file__ # executable version (py2exe) doesn't support __file__
datapath = os.path.dirname(pycompat.sysexecutable) datapath = os.path.dirname(pycompat.sysexecutable)
else: else:
datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__))) datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__)))
try: try:
import importlib from importlib import resources
# Force loading of the resources module # Force loading of the resources module
importlib.resources.open_binary # pytype: disable=module-attr resources.open_binary # pytype: disable=module-attr
def open_resource(package, name): def open_resource(package, name):
package = b'mercurial.' + package package = b'mercurial.' + package
return importlib.resources.open_binary( # pytype: disable=module-attr return resources.open_binary( # pytype: disable=module-attr
pycompat.sysstr(package), pycompat.sysstr(name) pycompat.sysstr(package), pycompat.sysstr(name)
) )
def list_resources(package): def list_resources(package):
package = b'mercurial.' + package package = b'mercurial.' + package
for name in importlib.resources.contents(pycompat.sysstr(package)): for name in resources.contents(pycompat.sysstr(package)):
if importlib.resources.is_resource(pycompat.sysstr(package), name): if resources.is_resource(pycompat.sysstr(package), name):
yield pycompat.sysbytes(name) yield pycompat.sysbytes(name)
except AttributeError: except (ImportError, AttributeError):
def _package_path(package): def _package_path(package):
return os.path.join(datapath, *package.split(b'.')) return os.path.join(datapath, *package.split(b'.'))
def open_resource(package, name): def open_resource(package, name):
path = os.path.join(_package_path(package), name) path = os.path.join(_package_path(package), name)
return open(path, 'rb') return open(path, 'rb')
def list_resources(package): def list_resources(package):
for name, kind in osutil.listdir(_package_path(package)): for name, kind in osutil.listdir(_package_path(package)):
if kind == statmod.S_IFREG: if kind == statmod.S_IFREG:
yield name yield name