[PATCH 1 of 4] py3: update test-check-py3-compat.t output

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Fri Aug 5 12:14:14 EDT 2016


At Fri, 5 Aug 2016 16:18:57 +0530,
Pulkit Goyal wrote:
> 
> > @@ -136,7 +136,7 @@
> >    mercurial/patch.py: error importing: <TypeError> getattr(): attribute name must be string (error at pycompat.py:*) (glob)
> >    mercurial/pathutil.py: error importing: <TypeError> getattr(): attribute name must be string (error at pycompat.py:*) (glob)
> >    mercurial/peer.py: error importing: <TypeError> getattr(): attribute name must be string (error at pycompat.py:*) (glob)
> > -  mercurial/pure/mpatch.py: error importing module: <ImportError> cannot import name 'pycompat' (line *) (glob)
> > +  mercurial/pure/mpatch.py: error importing module: <ImportError> cannot import name 'policy' (line 12)
> >    mercurial/pure/osutil.py: error importing module: <ImportError> cannot import name 'policy' (line *) (glob)
> >    mercurial/pure/parsers.py: error importing module: <ImportError> No module named 'mercurial.pure.node' (line *) (glob)
> >    mercurial/pushkey.py: error importing: <TypeError> getattr(): attribute name must be string (error at pycompat.py:*) (glob)
> >
> > Would you have any suggestion for me ?
> 
> mpatch.py doesnot imports policy, do cross-check that (I think you
> have already done that) line 12 in mpatch.py says from . import
> pycompat, not from . import policy. Moreover I don't see a reason for
> this behaviour if you have from . import pycompat there. If I can have
> a look at your repo, I can say more :)

Oh, sorry. I have tested test-check-py3-compat.t on tip of
hg-committed repo (at that time), and it includes Maciej's cffi work
on pure/mpatch.py.

    https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-July/086555.html
    or https://www.mercurial-scm.org/repo/hg-committed/rev/f2846d546645

This replaced "from . import pycompat" by "from . import policy, pycompat".

I can confirm expected result of test-check-py3-compat.t at testing on
current tip of main hg repo. Thank you !

This means that we should update test-check-py3-compat.t soon again,
though :-P


----------------------------------------------------------------------
[FUJIWARA Katsunori]                             foozy at lares.dti.ne.jp


More information about the Mercurial-devel mailing list