[Mesa-dev] [PATCH mesa 6/6] scons: use python3-compatible string-check

Eric Engestrom eric.engestrom at imgtec.com
Tue Sep 19 14:41:51 UTC 2017


On Tuesday, 2017-09-19 10:20:34 -0400, Ilia Mirkin wrote:
> This might be python3-compatible, but it's not the same thing. str !=
> unicode. Not sure where "names" can come from, but if it can come in
> as a unicode string, this won't work.

Thanks, this was the patch I was the least-sure about.
Dropping it from the series.

I also just realized I forgot to mention how I generated these changes;
I'll add this to the commit messages:

	These changes were generated using python's `2to3` tool.

Cheers,
  Eric

> 
> On Tue, Sep 19, 2017 at 10:14 AM, Eric Engestrom
> <eric.engestrom at imgtec.com> wrote:
> > Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
> > ---
> >  scons/custom.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scons/custom.py b/scons/custom.py
> > index 0767ba936d410167116d..978ee5f9ec7c23a74cb9 100644
> > --- a/scons/custom.py
> > +++ b/scons/custom.py
> > @@ -257,7 +257,7 @@ def parse_source_list(env, filename, names=None):
> >      sym_table = parser.parse(src.abspath)
> >
> >      if names:
> > -        if isinstance(names, basestring):
> > +        if isinstance(names, str):
> >              names = [names]
> >
> >          symbols = names
> > --
> > Cheers,
> >   Eric
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list