[PATCH] demandimport: fix level passed to loader of sub-modules

[Gregory Szorc]

On Mon, Nov 2, 2015 at 6:10 AM, Yuya Nishihara <yuya at tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1446380349 -32400
> #      Sun Nov 01 21:19:09 2015 +0900
> # Node ID d779ddd9edd51273de2754748dfcc0db1e1e0f72
> # Parent  58b7f3e93bbab749ab16c09df12aae5ba7880708
> demandimport: fix level passed to loader of sub-modules
>
> As the fromlist gives the names of sub-modules, they should be searched in
> the parent directory of the package's __init__.py, which is level=1.
>
> I got the following error by rewriting hgweb to use absolute_import, where
> the "mercurial" package is referenced as ".." (level=2):
>
>   ValueError: Attempted relative import beyond toplevel package
>
> I know little about the import mechanism, but this change seems correct.
> Before this patch, the following code did import the os module with no
> error:
>
>   from mercurial import demandimport
>   demandimport.enable()
>   from mercurial import os
>   print os.name
>
> diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py
> --- a/mercurial/demandimport.py
> +++ b/mercurial/demandimport.py
> @@ -164,7 +164,7 @@ def _demandimport(name, globals=None, lo
>          # The name of the module the import statement is located in.
>          globalname = globals.get('__name__')
>
> -        def processfromitem(mod, attr, **kwargs):
> +        def processfromitem(mod, attr):
>              """Process an imported symbol in the import statement.
>
>              If the symbol doesn't exist in the parent module, it must be a
> @@ -172,7 +172,7 @@ def _demandimport(name, globals=None, lo
>              """
>              symbol = getattr(mod, attr, nothing)
>              if symbol is nothing:
> -                symbol = _demandmod(attr, mod.__dict__, locals, **kwargs)
> +                symbol = _demandmod(attr, mod.__dict__, locals, level=1)
>                  setattr(mod, attr, symbol)
>
>              # Record the importing module references this symbol so we can
> @@ -194,7 +194,7 @@ def _demandimport(name, globals=None, lo
>              mod = _hgextimport(_origimport, name, globals, locals,
> level=level)
>
>              for x in fromlist:
> -                processfromitem(mod, x, level=level)
> +                processfromitem(mod, x)
>
>              return mod
>

This patch looks good to me.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151107/b327982c/attachment.html>