Patchwork [01,of,10] tests: update test-patchbomb to pass our import checker

login
register
mail settings
Submitter Augie Fackler
Date Aug. 28, 2017, 3:27 p.m.
Message ID <9bf8bd287bbf25b615a7.1503934049@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/23423/
State Accepted
Headers show

Comments

Augie Fackler - Aug. 28, 2017, 3:27 p.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1503435546 14400
#      Tue Aug 22 16:59:06 2017 -0400
# Node ID 9bf8bd287bbf25b615a74cb6a47cce9c33bace4a
# Parent  b1f75d8e887a4c06e6b120807f3defc5c7b78d33
tests: update test-patchbomb to pass our import checker
Gregory Szorc - Aug. 29, 2017, 4:11 a.m.
On Mon, Aug 28, 2017 at 8:27 AM, Augie Fackler <raf@durin42.com> wrote:

> # HG changeset patch
> # User Augie Fackler <raf@durin42.com>
> # Date 1503435546 14400
> #      Tue Aug 22 16:59:06 2017 -0400
> # Node ID 9bf8bd287bbf25b615a74cb6a47cce9c33bace4a
> # Parent  b1f75d8e887a4c06e6b120807f3defc5c7b78d33
> tests: update test-patchbomb to pass our import checker
>

Queued, thanks.


>
> diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t
> --- a/tests/test-patchbomb.t
> +++ b/tests/test-patchbomb.t
> @@ -9,18 +9,19 @@ Mercurial-patchbomb/.* -> Mercurial-patc
>  --===+[0-9]+=+$ -> --===*= (glob)
>
>    $ cat > prune-blank-after-boundary.py <<EOF
> +  > from __future__ import absolute_import, print_function
>    > import sys
>    > skipblank = False
>    > trim = lambda x: x.strip(' \r\n')
>    > for l in sys.stdin:
>    >     if trim(l).endswith('=--') or trim(l).endswith('=='):
>    >         skipblank = True
> -  >         print l,
> +  >         print(l, end='')
>    >         continue
>    >     if not trim(l) and skipblank:
>    >         continue
>    >     skipblank = False
> -  >     print l,
> +  >     print(l, end='')
>    > EOF
>    $ FILTERBOUNDARY="$PYTHON `pwd`/prune-blank-after-boundary.py"
>    $ echo "[format]" >> $HGRCPATH
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t
--- a/tests/test-patchbomb.t
+++ b/tests/test-patchbomb.t
@@ -9,18 +9,19 @@  Mercurial-patchbomb/.* -> Mercurial-patc
 --===+[0-9]+=+$ -> --===*= (glob)
 
   $ cat > prune-blank-after-boundary.py <<EOF
+  > from __future__ import absolute_import, print_function
   > import sys
   > skipblank = False
   > trim = lambda x: x.strip(' \r\n')
   > for l in sys.stdin:
   >     if trim(l).endswith('=--') or trim(l).endswith('=='):
   >         skipblank = True
-  >         print l,
+  >         print(l, end='')
   >         continue
   >     if not trim(l) and skipblank:
   >         continue
   >     skipblank = False
-  >     print l,
+  >     print(l, end='')
   > EOF
   $ FILTERBOUNDARY="$PYTHON `pwd`/prune-blank-after-boundary.py"
   $ echo "[format]" >> $HGRCPATH