This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7980

resourceutil: ensure `_rootpath` is defined under py2exe
ClosedPublic

Authored by mharbison72 on Jan 24 2020, 1:43 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa90039b07343: resourceutil: ensure `_rootpath` is defined under py2exe
Summary

Can't even run hg version without this.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mharbison72 created this revision.Jan 24 2020, 1:43 AM
dlax added a subscriber: dlax.Jan 24 2020, 2:27 AM
dlax added inline comments.
mercurial/utils/resourceutil.py
39

_rootpath declaration could be moved after the else clause to avoid repetition.

mharbison72 added inline comments.Jan 24 2020, 8:25 AM
mercurial/utils/resourceutil.py
39

Works for me, if someone wants to fix inflight.

mharbison72 added a commit: rHGa90039b07343: resourceutil: ensure `_rootpath` is defined under py2exe.Jan 24 2020, 11:06 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGa90039b07343: resourceutil: ensure `_rootpath` is defined under py2exe (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/resourceutil.py (1 line)

Diff 19542

mercurial/utils/resourceutil.py

or imp.is_frozen("__main__") # old py2exe or imp.is_frozen("__main__") # old py2exe
) # tools/freeze ) # tools/freeze
# 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)
_rootpath = os.path.dirname(datapath)
else: else:
datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__))) datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__)))
_rootpath = os.path.dirname(datapath) _rootpath = os.path.dirname(datapath)
dlaxUnsubmitted
Not Done

_rootpath declaration could be moved after the else clause to avoid repetition.

dlax: `_rootpath` declaration could be moved after the `else` clause to avoid repetition.
mharbison72AuthorUnsubmitted
Done

Works for me, if someone wants to fix inflight.

mharbison72: Works for me, if someone wants to fix inflight.
try: try:
from importlib import resources from importlib import resources
from .. import encoding from .. import encoding
# 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