GDB 7.6.50

gdb/testsuite/gdb.python/py-events.py

Index: gdb/testsuite/gdb.python/py-events.py
diff --git a/gdb/testsuite/gdb.python/py-events.py b/gdb/testsuite/gdb.python/py-events.py
index f7e45f56bcf1ebaabd83ef5a1555aa3c56d16f71..7601ca173c0c88fb568dfb6b8d5138dfc65f3ec1 100644
--- a/gdb/testsuite/gdb.python/py-events.py
+++ b/gdb/testsuite/gdb.python/py-events.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,59 +19,56 @@ import gdb
 
 def signal_stop_handler (event):
     if (isinstance (event, gdb.StopEvent)):
-        print "event type: stop"
+        print ("event type: stop")
     if (isinstance (event, gdb.SignalEvent)):
-        print "stop reason: signal"
-        print "stop signal: %s" % (event.stop_signal)
+        print ("stop reason: signal")
+        print ("stop signal: %s" % (event.stop_signal))
         if ( event.inferior_thread is not None) :
-            print "thread num: %s" % (event.inferior_thread.num);
+            print ("thread num: %s" % (event.inferior_thread.num))
 
 def breakpoint_stop_handler (event):
     if (isinstance (event, gdb.StopEvent)):
-        print "event type: stop"
+        print ("event type: stop")
     if (isinstance (event, gdb.BreakpointEvent)):
-        print "stop reason: breakpoint"
-        print "first breakpoint number: %s" % (event.breakpoint.number)
+        print ("stop reason: breakpoint")
+        print ("first breakpoint number: %s" % (event.breakpoint.number))
         for bp in event.breakpoints:
-        	print "breakpoint number: %s" % (bp.number)
+        	print ("breakpoint number: %s" % (bp.number))
         if ( event.inferior_thread is not None) :
-            print "thread num: %s" % (event.inferior_thread.num);
+            print ("thread num: %s" % (event.inferior_thread.num))
         else:
-            print "all threads stopped"
+            print ("all threads stopped")
 
 def exit_handler (event):
-    if (isinstance (event, gdb.ExitedEvent)):
-        print "event type: exit"
-    print "exit code: %d" % (event.exit_code)
-    print "exit inf: %d" % (event.inferior.num)
-    print "dir ok: %s" % str('exit_code' in dir(event))
+    assert (isinstance (event, gdb.ExitedEvent))
+    print ("event type: exit")
+    print ("exit code: %d" % (event.exit_code))
+    print ("exit inf: %d" % (event.inferior.num))
+    print ("dir ok: %s" % str('exit_code' in dir(event)))
 
 def continue_handler (event):
-    if (isinstance (event, gdb.ContinueEvent)):
-        print "event type: continue"
+    assert (isinstance (event, gdb.ContinueEvent))
+    print ("event type: continue")
     if ( event.inferior_thread is not None) :
-        print "thread num: %s" % (event.inferior_thread.num);
+        print ("thread num: %s" % (event.inferior_thread.num))
 
 def new_objfile_handler (event):
-    if (isinstance (event, gdb.NewObjFileEvent)):
-        print "event type: new_objfile"
-    if (event.new_objfile is not None):
-    	print "new objfile name: %s" % (event.new_objfile.filename)
-    else:
-        print "new objfile is None"
+    assert (isinstance (event, gdb.NewObjFileEvent))
+    print ("event type: new_objfile")
+    print ("new objfile name: %s" % (event.new_objfile.filename))
 
 class test_events (gdb.Command):
     """Test events."""
 
     def __init__ (self):
-        gdb.Command.__init__ (self, "test_events", gdb.COMMAND_STACK)
+        gdb.Command.__init__ (self, "test-events", gdb.COMMAND_STACK)
 
     def invoke (self, arg, from_tty):
         gdb.events.stop.connect (signal_stop_handler)
         gdb.events.stop.connect (breakpoint_stop_handler)
         gdb.events.exited.connect (exit_handler)
         gdb.events.cont.connect (continue_handler)
-        print "Event testers registered."
+        print ("Event testers registered.")
 
 test_events ()
 
@@ -79,10 +76,10 @@ class test_newobj_events (gdb.Command):
     """NewObj events."""
 
     def __init__ (self):
-        gdb.Command.__init__ (self, "test_newobj_events", gdb.COMMAND_STACK)
+        gdb.Command.__init__ (self, "test-objfile-events", gdb.COMMAND_STACK)
 
     def invoke (self, arg, from_tty):
         gdb.events.new_objfile.connect (new_objfile_handler)
-        print "New ObjectFile Event tester registered."
+        print ("Object file events registered.")
 
 test_newobj_events ()