This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12554

resourceutil: force filesystem access to resources when using py2exe
AcceptedPublic

Authored by mharbison72 on Wed, Apr 13, 6:48 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Summary

I don't know why it doesn't work, but it avoids this fatal error on startup:

> hg debugshell
Traceback (most recent call last):
  File "hg", line 58, in <module>
  File "mercurial\dispatch.pyc", line 143, in run
  File "mercurial\dispatch.pyc", line 232, in dispatch
  File "mercurial\dispatch.pyc", line 254, in _rundispatch
  File "mercurial\ui.pyc", line 316, in load
  File "mercurial\rcutil.pyc", line 98, in rccomponents
  File "mercurial\rcutil.pyc", line 68, in default_rc_resources
  File "mercurial\utils\resourceutil.pyc", line 102, in contents
  File "<frozen zipimport>", line 775, in contents
AssertionError

I assume the py2 version of py2exe never hit this because importlib.resources
failed to import.

Diff Detail

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

Event Timeline

mharbison72 created this revision.Wed, Apr 13, 6:48 PM
Alphare accepted this revision.Thu, Apr 14, 4:47 AM
Alphare added a subscriber: Alphare.

The setup.py transition to modern Python packaging is going to be fun!

This revision is now accepted and ready to land.Thu, Apr 14, 4:47 AM

Revision Contents
Changeset List

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

Diff 33169

mercurial/utils/resourceutil.py

try: try:
# importlib.resources exists from Python 3.7; see fallback in except clause # importlib.resources exists from Python 3.7; see fallback in except clause
# further down # further down
from importlib import resources # pytype: disable=import-error from importlib import resources # pytype: disable=import-error
# Force loading of the resources module # Force loading of the resources module
resources.open_binary # pytype: disable=module-attr resources.open_binary # pytype: disable=module-attr
# py2exe raises an AssertionError if uses importlib.resources
if getattr(sys, "frozen", None) in ("console_exe", "windows_exe"):
raise ImportError
except (ImportError, AttributeError): except (ImportError, AttributeError):
# importlib.resources was not found (almost definitely because we're on a # importlib.resources was not found (almost definitely because we're on a
# Python version before 3.7) # Python version before 3.7)
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")