| Submitter | timeless |
|---|---|
| Date | May 12, 2016, 1:23 a.m. |
| Message ID | <6a4c3eb0da5d63a0394b.1463016192@gcc2-power8.osuosl.org> |
| Download | mbox | patch |
| Permalink | /patch/15052/ |
| State | Accepted, archived |
| Headers | show |
Comments
On Thu, May 12, 2016 at 01:23:12AM +0000, timeless wrote: > # HG changeset patch > # User timeless <timeless@mozdev.org> > # Date 1463009081 0 > # Wed May 11 23:24:41 2016 +0000 > # Node ID 6a4c3eb0da5d63a0394bf68abe0b5d49c40ab96d > # Parent 5392b4af13e14ca77b24e94f7d390d89384b0ef5 > # Available At bb://timeless/mercurial-crew > # hg pull bb://timeless/mercurial-crew -r 6a4c3eb0da5d > hg: disable demandimport for py3 Queued, thanks! > > diff -r 5392b4af13e1 -r 6a4c3eb0da5d hg > --- a/hg Tue Apr 19 03:09:33 2016 +0000 > +++ b/hg Wed May 11 23:24:41 2016 +0000 > @@ -26,9 +26,9 @@ > > # enable importing on demand to reduce startup time > try: > - from mercurial import demandimport; demandimport.enable() > + if sys.version_info[0] < 3: > + from mercurial import demandimport; demandimport.enable() > except ImportError: > - import sys > sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" % > ' '.join(sys.path)) > sys.stderr.write("(check your install and PYTHONPATH)\n") > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Patch
diff -r 5392b4af13e1 -r 6a4c3eb0da5d hg --- a/hg Tue Apr 19 03:09:33 2016 +0000 +++ b/hg Wed May 11 23:24:41 2016 +0000 @@ -26,9 +26,9 @@ # enable importing on demand to reduce startup time try: - from mercurial import demandimport; demandimport.enable() + if sys.version_info[0] < 3: + from mercurial import demandimport; demandimport.enable() except ImportError: - import sys sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" % ' '.join(sys.path)) sys.stderr.write("(check your install and PYTHONPATH)\n")