Commit 858476d4 authored by Robert Bradshaw's avatar Robert Bradshaw

Python 2.3 fixes

parent bf259422
...@@ -177,7 +177,7 @@ class Node(object): ...@@ -177,7 +177,7 @@ class Node(object):
if isinstance(x, Node): if isinstance(x, Node):
return x.dump(level) return x.dump(level)
elif isinstance(x, list): elif isinstance(x, list):
return "[%s]" % ", ".join(dump_child(item, level) for item in x) return "[%s]" % ", ".join([dump_child(item, level) for item in x])
else: else:
return repr(x) return repr(x)
......
...@@ -295,7 +295,7 @@ def collect_unittests(path, suite, selectors): ...@@ -295,7 +295,7 @@ def collect_unittests(path, suite, selectors):
module = __import__(modulename) module = __import__(modulename)
for x in modulename.split('.')[1:]: for x in modulename.split('.')[1:]:
module = getattr(module, x) module = getattr(module, x)
suite.addTests(loader.loadTestsFromModule(module)) suite.addTests([loader.loadTestsFromModule(module)])
if __name__ == '__main__': if __name__ == '__main__':
from optparse import OptionParser from optparse import OptionParser
...@@ -369,7 +369,7 @@ if __name__ == '__main__': ...@@ -369,7 +369,7 @@ if __name__ == '__main__':
if options.filetests: if options.filetests:
filetests = TestBuilder(ROOTDIR, WORKDIR, selectors, filetests = TestBuilder(ROOTDIR, WORKDIR, selectors,
options.annotate_source, options.cleanup_workdir) options.annotate_source, options.cleanup_workdir)
test_suite.addTests(filetests.build_suite()) test_suite.addTests([filetests.build_suite()])
unittest.TextTestRunner(verbosity=options.verbosity).run(test_suite) unittest.TextTestRunner(verbosity=options.verbosity).run(test_suite)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment