Restore Python 3 support (Trac #9184)wip/python3-new

This reverts commit e4a597f2f527ba0cd15cb51dda15cb51871c984e.

Conflicts:
	testsuite/driver/testlib.py

1 files changed, 9 insertions, 13 deletions

diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index 031d955552..84b89d49bb 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -148,21 +148,17 @@ config.way_rts_flags = {
 # Useful classes of ways that can be used with only_ways() and
 # expect_broken_for().
 
-prof_ways = map (lambda x: x[0], \
-                 filter(lambda x: '-prof' in x[1], \
-                        config.way_flags('dummy_name').items()))
+prof_ways     = [x[0] for x in config.way_flags('dummy_name').items()
+                      if '-prof' in x[1]]
 
-threaded_ways = map (lambda x: x[0], \
-                 filter(lambda x: '-threaded' in x[1] or 'ghci' == x[0], \
-                        config.way_flags('dummy_name').items()))
+threaded_ways = [x[0] for x in config.way_flags('dummy_name').items()
+                      if '-threaded' in x[1] or 'ghci' == x[0]]
 
-opt_ways = map (lambda x: x[0], \
-                 filter(lambda x: '-O' in x[1], \
-                        config.way_flags('dummy_name').items()))
+opt_ways      = [x[0] for x in config.way_flags('dummy_name').items()
+                      if '-O' in x[1]]
 
-llvm_ways = map (lambda x: x[0], \
-                 filter(lambda x: '-fllvm' in x[1], \
-                        config.way_flags('dummy_name').items()))
+llvm_ways     = [x[0] for x in config.way_flags('dummy_name').items()
+                      if '-fflvm' in x[1]]
 
 def get_compiler_info():
 # This should really not go through the shell
@@ -192,7 +188,7 @@ def get_compiler_info():
 
     if re.match(".*_p(_.*|$)", rtsInfoDict["RTS way"]):
         config.compiler_profiled = True
-        config.run_ways = filter(lambda x: x != 'ghci', config.run_ways)
+        config.run_ways = [x for x in config.run_ways if x != 'ghci']
     else:
         config.compiler_profiled = False