[v3] Convert Python scripts to Python 3

Message ID 20200206234027.17311-1-alistair.francis@wdc.com
State New, archived
Headers

Commit Message

Alistair Francis Feb. 6, 2020, 11:40 p.m. UTC
  Change all of the #! lines in Python scripts that are called from
Makefiles to reference /usr/bin/python3.

All of the scripts called from Makefiles are already run with Python 3,
so let's make sure they are explicitly using Python 3 if called
manually.
---
 benchtests/scripts/bench.py             | 2 +-
 benchtests/scripts/validate_benchout.py | 2 +-
 conform/glibcconform.py                 | 2 +-
 conform/linknamespace.py                | 2 +-
 conform/list-header-symbols.py          | 2 +-
 math/gen-libm-test.py                   | 2 +-
 math/gen-tgmath-tests.py                | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
  

Comments

Alistair Francis Feb. 14, 2020, 4:39 p.m. UTC | #1
On Thu, Feb 6, 2020 at 3:47 PM Alistair Francis
<alistair.francis@wdc.com> wrote:
>
> Change all of the #! lines in Python scripts that are called from
> Makefiles to reference /usr/bin/python3.
>
> All of the scripts called from Makefiles are already run with Python 3,
> so let's make sure they are explicitly using Python 3 if called
> manually.

Ping!

> ---
>  benchtests/scripts/bench.py             | 2 +-
>  benchtests/scripts/validate_benchout.py | 2 +-
>  conform/glibcconform.py                 | 2 +-
>  conform/linknamespace.py                | 2 +-
>  conform/list-header-symbols.py          | 2 +-
>  math/gen-libm-test.py                   | 2 +-
>  math/gen-tgmath-tests.py                | 2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/benchtests/scripts/bench.py b/benchtests/scripts/bench.py
> index aeec5ccd23..a54ec6f7e3 100755
> --- a/benchtests/scripts/bench.py
> +++ b/benchtests/scripts/bench.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python3
>  # Copyright (C) 2014-2020 Free Software Foundation, Inc.
>  # This file is part of the GNU C Library.
>  #
> diff --git a/benchtests/scripts/validate_benchout.py b/benchtests/scripts/validate_benchout.py
> index 715218aff8..6b4877a67b 100755
> --- a/benchtests/scripts/validate_benchout.py
> +++ b/benchtests/scripts/validate_benchout.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python3
>  # Copyright (C) 2014-2020 Free Software Foundation, Inc.
>  # This file is part of the GNU C Library.
>  #
> diff --git a/conform/glibcconform.py b/conform/glibcconform.py
> index 6075745574..1440dedc83 100644
> --- a/conform/glibcconform.py
> +++ b/conform/glibcconform.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python3
>  # Shared code for glibc conformance tests.
>  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
>  # This file is part of the GNU C Library.
> diff --git a/conform/linknamespace.py b/conform/linknamespace.py
> index 87cd17b1ce..1d27e4cfba 100644
> --- a/conform/linknamespace.py
> +++ b/conform/linknamespace.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python3
>  # Check that use of symbols declared in a given header does not result
>  # in any symbols being brought in that are not reserved with external
>  # linkage for the given standard.
> diff --git a/conform/list-header-symbols.py b/conform/list-header-symbols.py
> index e43c12ec40..bfa463a303 100644
> --- a/conform/list-header-symbols.py
> +++ b/conform/list-header-symbols.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python3
>  # Print a list of symbols exported by some headers that would
>  # otherwise be in the user's namespace.
>  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
> diff --git a/math/gen-libm-test.py b/math/gen-libm-test.py
> index ec263397d8..0142c0f332 100755
> --- a/math/gen-libm-test.py
> +++ b/math/gen-libm-test.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python3
>  # Generate tests for libm functions.
>  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
>  # This file is part of the GNU C Library.
> diff --git a/math/gen-tgmath-tests.py b/math/gen-tgmath-tests.py
> index ef207dd852..c225b64db1 100755
> --- a/math/gen-tgmath-tests.py
> +++ b/math/gen-tgmath-tests.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python3
>  # Generate tests for <tgmath.h> macros.
>  # Copyright (C) 2017-2020 Free Software Foundation, Inc.
>  # This file is part of the GNU C Library.
> --
> 2.25.0
>
  
Alistair Francis Feb. 26, 2020, 12:56 a.m. UTC | #2
On Fri, Feb 14, 2020 at 8:39 AM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Thu, Feb 6, 2020 at 3:47 PM Alistair Francis
> <alistair.francis@wdc.com> wrote:
> >
> > Change all of the #! lines in Python scripts that are called from
> > Makefiles to reference /usr/bin/python3.
> >
> > All of the scripts called from Makefiles are already run with Python 3,
> > so let's make sure they are explicitly using Python 3 if called
> > manually.
>
> Ping!

Ping^2

Alistair

>
> > ---
> >  benchtests/scripts/bench.py             | 2 +-
> >  benchtests/scripts/validate_benchout.py | 2 +-
> >  conform/glibcconform.py                 | 2 +-
> >  conform/linknamespace.py                | 2 +-
> >  conform/list-header-symbols.py          | 2 +-
> >  math/gen-libm-test.py                   | 2 +-
> >  math/gen-tgmath-tests.py                | 2 +-
> >  7 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/benchtests/scripts/bench.py b/benchtests/scripts/bench.py
> > index aeec5ccd23..a54ec6f7e3 100755
> > --- a/benchtests/scripts/bench.py
> > +++ b/benchtests/scripts/bench.py
> > @@ -1,4 +1,4 @@
> > -#!/usr/bin/python
> > +#!/usr/bin/python3
> >  # Copyright (C) 2014-2020 Free Software Foundation, Inc.
> >  # This file is part of the GNU C Library.
> >  #
> > diff --git a/benchtests/scripts/validate_benchout.py b/benchtests/scripts/validate_benchout.py
> > index 715218aff8..6b4877a67b 100755
> > --- a/benchtests/scripts/validate_benchout.py
> > +++ b/benchtests/scripts/validate_benchout.py
> > @@ -1,4 +1,4 @@
> > -#!/usr/bin/python
> > +#!/usr/bin/python3
> >  # Copyright (C) 2014-2020 Free Software Foundation, Inc.
> >  # This file is part of the GNU C Library.
> >  #
> > diff --git a/conform/glibcconform.py b/conform/glibcconform.py
> > index 6075745574..1440dedc83 100644
> > --- a/conform/glibcconform.py
> > +++ b/conform/glibcconform.py
> > @@ -1,4 +1,4 @@
> > -#!/usr/bin/python
> > +#!/usr/bin/python3
> >  # Shared code for glibc conformance tests.
> >  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
> >  # This file is part of the GNU C Library.
> > diff --git a/conform/linknamespace.py b/conform/linknamespace.py
> > index 87cd17b1ce..1d27e4cfba 100644
> > --- a/conform/linknamespace.py
> > +++ b/conform/linknamespace.py
> > @@ -1,4 +1,4 @@
> > -#!/usr/bin/python
> > +#!/usr/bin/python3
> >  # Check that use of symbols declared in a given header does not result
> >  # in any symbols being brought in that are not reserved with external
> >  # linkage for the given standard.
> > diff --git a/conform/list-header-symbols.py b/conform/list-header-symbols.py
> > index e43c12ec40..bfa463a303 100644
> > --- a/conform/list-header-symbols.py
> > +++ b/conform/list-header-symbols.py
> > @@ -1,4 +1,4 @@
> > -#!/usr/bin/python
> > +#!/usr/bin/python3
> >  # Print a list of symbols exported by some headers that would
> >  # otherwise be in the user's namespace.
> >  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
> > diff --git a/math/gen-libm-test.py b/math/gen-libm-test.py
> > index ec263397d8..0142c0f332 100755
> > --- a/math/gen-libm-test.py
> > +++ b/math/gen-libm-test.py
> > @@ -1,4 +1,4 @@
> > -#!/usr/bin/python
> > +#!/usr/bin/python3
> >  # Generate tests for libm functions.
> >  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
> >  # This file is part of the GNU C Library.
> > diff --git a/math/gen-tgmath-tests.py b/math/gen-tgmath-tests.py
> > index ef207dd852..c225b64db1 100755
> > --- a/math/gen-tgmath-tests.py
> > +++ b/math/gen-tgmath-tests.py
> > @@ -1,4 +1,4 @@
> > -#!/usr/bin/python
> > +#!/usr/bin/python3
> >  # Generate tests for <tgmath.h> macros.
> >  # Copyright (C) 2017-2020 Free Software Foundation, Inc.
> >  # This file is part of the GNU C Library.
> > --
> > 2.25.0
> >
  
Alistair Francis March 3, 2020, 5:55 p.m. UTC | #3
On Tue, Feb 25, 2020 at 4:56 PM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Fri, Feb 14, 2020 at 8:39 AM Alistair Francis <alistair23@gmail.com> wrote:
> >
> > On Thu, Feb 6, 2020 at 3:47 PM Alistair Francis
> > <alistair.francis@wdc.com> wrote:
> > >
> > > Change all of the #! lines in Python scripts that are called from
> > > Makefiles to reference /usr/bin/python3.
> > >
> > > All of the scripts called from Makefiles are already run with Python 3,
> > > so let's make sure they are explicitly using Python 3 if called
> > > manually.
> >
> > Ping!
>
> Ping^2

Ping^3

Alistair

>
> Alistair
>
> >
> > > ---
> > >  benchtests/scripts/bench.py             | 2 +-
> > >  benchtests/scripts/validate_benchout.py | 2 +-
> > >  conform/glibcconform.py                 | 2 +-
> > >  conform/linknamespace.py                | 2 +-
> > >  conform/list-header-symbols.py          | 2 +-
> > >  math/gen-libm-test.py                   | 2 +-
> > >  math/gen-tgmath-tests.py                | 2 +-
> > >  7 files changed, 7 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/benchtests/scripts/bench.py b/benchtests/scripts/bench.py
> > > index aeec5ccd23..a54ec6f7e3 100755
> > > --- a/benchtests/scripts/bench.py
> > > +++ b/benchtests/scripts/bench.py
> > > @@ -1,4 +1,4 @@
> > > -#!/usr/bin/python
> > > +#!/usr/bin/python3
> > >  # Copyright (C) 2014-2020 Free Software Foundation, Inc.
> > >  # This file is part of the GNU C Library.
> > >  #
> > > diff --git a/benchtests/scripts/validate_benchout.py b/benchtests/scripts/validate_benchout.py
> > > index 715218aff8..6b4877a67b 100755
> > > --- a/benchtests/scripts/validate_benchout.py
> > > +++ b/benchtests/scripts/validate_benchout.py
> > > @@ -1,4 +1,4 @@
> > > -#!/usr/bin/python
> > > +#!/usr/bin/python3
> > >  # Copyright (C) 2014-2020 Free Software Foundation, Inc.
> > >  # This file is part of the GNU C Library.
> > >  #
> > > diff --git a/conform/glibcconform.py b/conform/glibcconform.py
> > > index 6075745574..1440dedc83 100644
> > > --- a/conform/glibcconform.py
> > > +++ b/conform/glibcconform.py
> > > @@ -1,4 +1,4 @@
> > > -#!/usr/bin/python
> > > +#!/usr/bin/python3
> > >  # Shared code for glibc conformance tests.
> > >  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
> > >  # This file is part of the GNU C Library.
> > > diff --git a/conform/linknamespace.py b/conform/linknamespace.py
> > > index 87cd17b1ce..1d27e4cfba 100644
> > > --- a/conform/linknamespace.py
> > > +++ b/conform/linknamespace.py
> > > @@ -1,4 +1,4 @@
> > > -#!/usr/bin/python
> > > +#!/usr/bin/python3
> > >  # Check that use of symbols declared in a given header does not result
> > >  # in any symbols being brought in that are not reserved with external
> > >  # linkage for the given standard.
> > > diff --git a/conform/list-header-symbols.py b/conform/list-header-symbols.py
> > > index e43c12ec40..bfa463a303 100644
> > > --- a/conform/list-header-symbols.py
> > > +++ b/conform/list-header-symbols.py
> > > @@ -1,4 +1,4 @@
> > > -#!/usr/bin/python
> > > +#!/usr/bin/python3
> > >  # Print a list of symbols exported by some headers that would
> > >  # otherwise be in the user's namespace.
> > >  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
> > > diff --git a/math/gen-libm-test.py b/math/gen-libm-test.py
> > > index ec263397d8..0142c0f332 100755
> > > --- a/math/gen-libm-test.py
> > > +++ b/math/gen-libm-test.py
> > > @@ -1,4 +1,4 @@
> > > -#!/usr/bin/python
> > > +#!/usr/bin/python3
> > >  # Generate tests for libm functions.
> > >  # Copyright (C) 2018-2020 Free Software Foundation, Inc.
> > >  # This file is part of the GNU C Library.
> > > diff --git a/math/gen-tgmath-tests.py b/math/gen-tgmath-tests.py
> > > index ef207dd852..c225b64db1 100755
> > > --- a/math/gen-tgmath-tests.py
> > > +++ b/math/gen-tgmath-tests.py
> > > @@ -1,4 +1,4 @@
> > > -#!/usr/bin/python
> > > +#!/usr/bin/python3
> > >  # Generate tests for <tgmath.h> macros.
> > >  # Copyright (C) 2017-2020 Free Software Foundation, Inc.
> > >  # This file is part of the GNU C Library.
> > > --
> > > 2.25.0
> > >
  
Joseph Myers March 3, 2020, 11:33 p.m. UTC | #4
This patch is OK.
  

Patch

diff --git a/benchtests/scripts/bench.py b/benchtests/scripts/bench.py
index aeec5ccd23..a54ec6f7e3 100755
--- a/benchtests/scripts/bench.py
+++ b/benchtests/scripts/bench.py
@@ -1,4 +1,4 @@ 
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright (C) 2014-2020 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
diff --git a/benchtests/scripts/validate_benchout.py b/benchtests/scripts/validate_benchout.py
index 715218aff8..6b4877a67b 100755
--- a/benchtests/scripts/validate_benchout.py
+++ b/benchtests/scripts/validate_benchout.py
@@ -1,4 +1,4 @@ 
-#!/usr/bin/python
+#!/usr/bin/python3
 # Copyright (C) 2014-2020 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
diff --git a/conform/glibcconform.py b/conform/glibcconform.py
index 6075745574..1440dedc83 100644
--- a/conform/glibcconform.py
+++ b/conform/glibcconform.py
@@ -1,4 +1,4 @@ 
-#!/usr/bin/python
+#!/usr/bin/python3
 # Shared code for glibc conformance tests.
 # Copyright (C) 2018-2020 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/conform/linknamespace.py b/conform/linknamespace.py
index 87cd17b1ce..1d27e4cfba 100644
--- a/conform/linknamespace.py
+++ b/conform/linknamespace.py
@@ -1,4 +1,4 @@ 
-#!/usr/bin/python
+#!/usr/bin/python3
 # Check that use of symbols declared in a given header does not result
 # in any symbols being brought in that are not reserved with external
 # linkage for the given standard.
diff --git a/conform/list-header-symbols.py b/conform/list-header-symbols.py
index e43c12ec40..bfa463a303 100644
--- a/conform/list-header-symbols.py
+++ b/conform/list-header-symbols.py
@@ -1,4 +1,4 @@ 
-#!/usr/bin/python
+#!/usr/bin/python3
 # Print a list of symbols exported by some headers that would
 # otherwise be in the user's namespace.
 # Copyright (C) 2018-2020 Free Software Foundation, Inc.
diff --git a/math/gen-libm-test.py b/math/gen-libm-test.py
index ec263397d8..0142c0f332 100755
--- a/math/gen-libm-test.py
+++ b/math/gen-libm-test.py
@@ -1,4 +1,4 @@ 
-#!/usr/bin/python
+#!/usr/bin/python3
 # Generate tests for libm functions.
 # Copyright (C) 2018-2020 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
diff --git a/math/gen-tgmath-tests.py b/math/gen-tgmath-tests.py
index ef207dd852..c225b64db1 100755
--- a/math/gen-tgmath-tests.py
+++ b/math/gen-tgmath-tests.py
@@ -1,4 +1,4 @@ 
-#!/usr/bin/python
+#!/usr/bin/python3
 # Generate tests for <tgmath.h> macros.
 # Copyright (C) 2017-2020 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.