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

This reverts commit e4a597f2f527ba0cd15cb51dda15cb51871c984e.

Conflicts:
	testsuite/driver/testlib.py

1 files changed, 0 insertions, 34 deletions

diff --git a/testsuite/driver/testutil.py b/testsuite/driver/testutil.py
index 0738683111..ec45e93987 100644
--- a/testsuite/driver/testutil.py
+++ b/testsuite/driver/testutil.py
@@ -1,39 +1,5 @@
 # -----------------------------------------------------------------------------
 # Utils
-
-def id(a):
-    return a
-
-def eq(x):
-    return lambda y,z=x: y == z
-
-def neq(x):
-    return lambda y,z=x: y != z
-
-def append(x,y):
-    return x + y
-
-def concat(xs):
-    return reduce(append,xs,[])
-
-def chop(s):
-    if s[len(s)-1:] == '\n':
-        return s[:len(s)-1]
-    else:
-        return s
-    
-def all(p,xs):
-    for x in xs:
-        if not p(x):
-            return False
-    return True
-
-def elem(xs):
-    return lambda x: x in xs
-
-def notElem(xs):
-    return lambda x: x not in xs
-
 def version_to_ints(v):
     return [ int(x) for x in v.split('.') ]