Patchwork [1,of,2] py3: update output of check-py3-compat.py with python3

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Aug. 8, 2016, 5:31 p.m.
Message ID <28e13e7cac1c695702e1.1470677493@juju>
Download mbox | patch
Permalink /patch/16208/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - Aug. 8, 2016, 5:31 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1470677314 -32400
#      Tue Aug 09 02:28:34 2016 +0900
# Node ID 28e13e7cac1c695702e160865cbc566b5a1acb70
# Parent  b410e26692a45fd9b61dc5fa100952e4c5f5169d
py3: update output of check-py3-compat.py with python3

Recent work on mercurial/pure/mpatch.py made it import
mercurial.policy, and changed output of check-py3-compat.py with
python3 in test-check-py3-compat.t. But test-check-py3-compat.t isn't
yet updated.
Yuya Nishihara - Aug. 9, 2016, 12:25 p.m.
On Tue, 09 Aug 2016 02:31:33 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
> # Date 1470677314 -32400
> #      Tue Aug 09 02:28:34 2016 +0900
> # Node ID 28e13e7cac1c695702e160865cbc566b5a1acb70
> # Parent  b410e26692a45fd9b61dc5fa100952e4c5f5169d
> py3: update output of check-py3-compat.py with python3

Sure, queued the series. Thanks.

Patch

diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t
+++ b/tests/test-check-py3-compat.t
@@ -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 *) (glob)
   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)