[PATCH] list-workarounds: Convert to python3

[PATCH] list-workarounds: Convert to python3

[Ben Widawsky]

The rest of the tool suite that uses python already uses python3.
The tool configure requires python >= 3 (which is confusing because of
the no backward compat problem).

The world is slowly moving to python3.

Converted with 2to3.

CC: Damien Lespiau <damien.lespiau@intel.com>
CC: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 scripts/list-workarounds | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/list-workarounds b/scripts/list-workarounds
index 6c8c636..b874fd8 100755
--- a/scripts/list-workarounds
+++ b/scripts/list-workarounds
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os,sys
 import optparse
@@ -29,7 +29,7 @@ wa_re = re.compile('(?P<name>Wa[A-Z0-9][a-zA-Z0-9_]+):(?P<platforms>[a-z,]+)')
 waname_re = re.compile('(?P<name>Wa[A-Z0-9][a-zA-Z0-9_]+)')
 def parse(me):
 	for line in me.splitlines():
-		match = wa_re.search(line)
+		match = wa_re.search(str(line))
 		if not match:
 			if not verbose:
 				continue
@@ -103,8 +103,8 @@ if __name__ == '__main__':
 		sys.exit(1)
 
 	parse(work_arounds)
-	for wa in sorted(workarounds.iterkeys()):
+	for wa in sorted(workarounds.keys()):
 		if not options.platform:
-			print("%s: %s" % (wa, ', '.join(workarounds[wa])))
+			print(("%s: %s" % (wa, ', '.join(workarounds[wa]))))
 		elif options.platform in workarounds[wa]:
 			print(wa)
-- 
1.8.2.2

Re: [PATCH] list-workarounds: Convert to python3

[Kenneth Graunke]

On 05/10/2013 03:28 PM, Ben Widawsky wrote:
> The rest of the tool suite that uses python already uses python3.
> The tool configure requires python >= 3 (which is confusing because of
> the no backward compat problem).
>
> The world is slowly moving to python3.
>
> Converted with 2to3.
>
> CC: Damien Lespiau <damien.lespiau@intel.com>
> CC: Kenneth Graunke <kenneth@whitecape.org>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

Re: [PATCH] list-workarounds: Convert to python3

[Damien Lespiau]

On Fri, May 10, 2013 at 03:28:29PM -0700, Ben Widawsky wrote:
> -			print("%s: %s" % (wa, ', '.join(workarounds[wa])))
> +			print(("%s: %s" % (wa, ', '.join(workarounds[wa]))))

This one adds extra () that are not necessary. Other than that, ship it!

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

-- 
Damien

Re: [PATCH] list-workarounds: Convert to python3

[Ben Widawsky]

On Sat, May 11, 2013 at 05:38:03PM +0100, Damien Lespiau wrote:
> On Fri, May 10, 2013 at 03:28:29PM -0700, Ben Widawsky wrote:
> > -			print("%s: %s" % (wa, ', '.join(workarounds[wa])))
> > +			print(("%s: %s" % (wa, ', '.join(workarounds[wa]))))
> 
> This one adds extra () that are not necessary. Other than that, ship it!
> 
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
> 
> -- 
> Damien

Yeah, weird, not sure why 2to3 did that... Removed, and pushed. Thanks.

-- 
Ben Widawsky, Intel Open Source Technology Center