Patchwork [1,of,5] py3: use absolute_import in test-hgweb-no-path-info.t

login
register
mail settings
Submitter timeless@mozdev.org
Date April 10, 2016, 9:57 p.m.
Message ID <512f4e60a0723ad3c7d8.1460325454@waste.org>
Download mbox | patch
Permalink /patch/14492/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

timeless@mozdev.org - April 10, 2016, 9:57 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1460323918 0
#      Sun Apr 10 21:31:58 2016 +0000
# Node ID 512f4e60a0723ad3c7d80d669dfc0db0928afd19
# Parent  c5565fc8848dd084d104ca40c33d1acdfcff8bc6
py3: use absolute_import in test-hgweb-no-path-info.t
timeless - April 10, 2016, 9:59 p.m.
This is a placeholder series, the real series runs is Available At
https://bitbucket.org/timeless/mercurial-crew
             hg pull https://bitbucket.org/timeless/mercurial-crew -r
eeb488adee2f

If this series is applied to @committed (d54a7410307f) it will work
nicely. It doesn't actually work with @default (c5565fc8848d), as it
needs (68a946e83188 pycompat: util.stringio).

On Sun, Apr 10, 2016 at 5:57 PM, timeless <timeless@mozdev.org> wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1460323918 0
> #      Sun Apr 10 21:31:58 2016 +0000
> # Node ID 512f4e60a0723ad3c7d80d669dfc0db0928afd19
> # Parent  c5565fc8848dd084d104ca40c33d1acdfcff8bc6
> py3: use absolute_import in test-hgweb-no-path-info.t
>
> diff --git a/tests/test-hgweb-no-path-info.t b/tests/test-hgweb-no-path-info.t
> --- a/tests/test-hgweb-no-path-info.t
> +++ b/tests/test-hgweb-no-path-info.t
> @@ -15,9 +15,14 @@
>    summary:     test
>
>    $ cat > request.py <<EOF
> -  > from mercurial.hgweb import hgweb, hgwebdir
> +  > from __future__ import absolute_import
> +  > import os
> +  > import sys
>    > from StringIO import StringIO
> -  > import os, sys
> +  > from mercurial.hgweb import (
> +  >     hgweb,
> +  >     hgwebdir,
> +  > )
>    >
>    > errors = StringIO()
>    > input = StringIO()
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-hgweb-no-path-info.t b/tests/test-hgweb-no-path-info.t
--- a/tests/test-hgweb-no-path-info.t
+++ b/tests/test-hgweb-no-path-info.t
@@ -15,9 +15,14 @@ 
   summary:     test
   
   $ cat > request.py <<EOF
-  > from mercurial.hgweb import hgweb, hgwebdir
+  > from __future__ import absolute_import
+  > import os
+  > import sys
   > from StringIO import StringIO
-  > import os, sys
+  > from mercurial.hgweb import (
+  >     hgweb,
+  >     hgwebdir,
+  > )
   > 
   > errors = StringIO()
   > input = StringIO()