Mercurial > public > mercurial-scm > hg-stable
diff mercurial/sslutil.py @ 43712:664e24207728
procutil: move mainfrozen() to new resourceutil.py
The i18n module practically depends on procutil for mainfrozen() but
since procutil depends on i18n, it would be a circular dependency if
i18n depended directly on procutil. The cycle is currently resolved by
having the higher-level util module calculate the "datapath" and
inject it into i18n. Extracting mainfrozen() to a new module lets us
clean up the dependencies.
Differential Revision: https://phab.mercurial-scm.org/D7433
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 14 Nov 2019 11:52:22 -0800 |
parents | 9f70512ae2cf |
children | cbc5755df6bf |
line wrap: on
line diff
--- a/mercurial/sslutil.py Thu Nov 14 17:36:01 2019 -0800 +++ b/mercurial/sslutil.py Thu Nov 14 11:52:22 2019 -0800 @@ -24,7 +24,7 @@ util, ) from .utils import ( - procutil, + resourceutil, stringutil, ) @@ -786,7 +786,7 @@ """ if ( not pycompat.isdarwin - or procutil.mainfrozen() + or resourceutil.mainfrozen() or not pycompat.sysexecutable ): return False