diff options
Diffstat (limited to 'Lib/test/test_cmd.py')
| -rw-r--r-- | Lib/test/test_cmd.py | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/Lib/test/test_cmd.py b/Lib/test/test_cmd.py index ed9258b1bfe..3a463558fb7 100644 --- a/Lib/test/test_cmd.py +++ b/Lib/test/test_cmd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Test script for the 'cmd' module Original by Michael Schneider @@ -7,10 +7,10 @@ Original by Michael Schneider import cmd import sys -from test import test_support import re import unittest -import StringIO +import io +from test import support class samplecmdclass(cmd.Cmd): """ @@ -100,9 +100,9 @@ class samplecmdclass(cmd.Cmd): <BLANKLINE> Test for the function columnize(): - >>> mycmd.columnize([str(i) for i in xrange(20)]) + >>> mycmd.columnize([str(i) for i in range(20)]) 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - >>> mycmd.columnize([str(i) for i in xrange(20)], 10) + >>> mycmd.columnize([str(i) for i in range(20)], 10) 0 7 14 1 8 15 2 9 16 @@ -136,18 +136,16 @@ class samplecmdclass(cmd.Cmd): """ def preloop(self): - print "Hello from preloop" + print("Hello from preloop") def postloop(self): - print "Hello from postloop" + print("Hello from postloop") def completedefault(self, *ignored): - print "This is the completedefault methode" - return + print("This is the completedefault methode") def complete_command(self): - print "complete command" - return + print("complete command") def do_shell(self, s): pass @@ -155,17 +153,17 @@ class samplecmdclass(cmd.Cmd): def do_add(self, s): l = s.split() if len(l) != 2: - print "*** invalid number of arguments" + print("*** invalid number of arguments") return try: l = [int(i) for i in l] except ValueError: - print "*** arguments should be numbers" + print("*** arguments should be numbers") return - print l[0]+l[1] + print(l[0]+l[1]) def help_add(self): - print "help text for add" + print("help text for add") return def do_exit(self, arg): @@ -177,7 +175,7 @@ class TestAlternateInput(unittest.TestCase): class simplecmd(cmd.Cmd): def do_print(self, args): - print >>self.stdout, args + print(args, file=self.stdout) def do_EOF(self, args): return True @@ -186,13 +184,13 @@ class TestAlternateInput(unittest.TestCase): class simplecmd2(simplecmd): def do_EOF(self, args): - print >>self.stdout, '*** Unknown syntax: EOF' + print('*** Unknown syntax: EOF', file=self.stdout) return True def test_file_with_missing_final_nl(self): - input = StringIO.StringIO("print test\nprint test2") - output = StringIO.StringIO() + input = io.StringIO("print test\nprint test2") + output = io.StringIO() cmd = self.simplecmd(stdin=input, stdout=output) cmd.use_rawinput = False cmd.cmdloop() @@ -203,8 +201,8 @@ class TestAlternateInput(unittest.TestCase): def test_input_reset_at_EOF(self): - input = StringIO.StringIO("print test\nprint test2") - output = StringIO.StringIO() + input = io.StringIO("print test\nprint test2") + output = io.StringIO() cmd = self.simplecmd2(stdin=input, stdout=output) cmd.use_rawinput = False cmd.cmdloop() @@ -212,8 +210,8 @@ class TestAlternateInput(unittest.TestCase): ("(Cmd) test\n" "(Cmd) test2\n" "(Cmd) *** Unknown syntax: EOF\n")) - input = StringIO.StringIO("print \n\n") - output = StringIO.StringIO() + input = io.StringIO("print \n\n") + output = io.StringIO() cmd.stdin = input cmd.stdout = output cmd.cmdloop() @@ -225,16 +223,16 @@ class TestAlternateInput(unittest.TestCase): def test_main(verbose=None): from test import test_cmd - test_support.run_doctest(test_cmd, verbose) - test_support.run_unittest(TestAlternateInput) + support.run_doctest(test_cmd, verbose) + support.run_unittest(TestAlternateInput) def test_coverage(coverdir): - trace = test_support.import_module('trace') + trace = support.import_module('trace') tracer=trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,], trace=0, count=1) tracer.run('reload(cmd);test_main()') r=tracer.results() - print "Writing coverage results..." + print("Writing coverage results...") r.write_results(show_missing=True, summary=True, coverdir=coverdir) if __name__ == "__main__": |