2012-12-10 Paul Koning <paul_koning@dell.com>

	* gdb.base/charset.exp: Change print syntax for Python 3
	compatibility.
	* gdb.python/py-block.exp: Ditto.
	* gdb.python/py-breakpoint.exp: Ditto.
	* gdb.python/py-cmd.exp: Ditto.
	* gdb.python/py-events.py: Ditto.
	* gdb.python/py-finish-breakpoint.py: Ditto.
	* gdb.python/py-finish-breakpoint2.exp: Ditto.
	* gdb.python/py-finish-breakpoint2.py: Ditto.
	* gdb.python/py-frame-inline.exp: Ditto.
	* gdb.python/py-frame.exp: Ditto.
	* gdb.python/py-infthread.exp: Ditto.
	* gdb.python/py-objfile.exp: Ditto.
	* gdb.python/py-parameter.exp: Ditto.
	* gdb.python/py-progspace.exp: Ditto.
	* gdb.python/py-prompt.exp: Ditto.
	* gdb.python/py-symbol.exp: Ditto.
	* gdb.python/py-symtab.exp: Ditto.
	* gdb.python/py-template.exp: Ditto.
	* gdb.python/py-value-cc.exp: Ditto.
	* gdb.python/python.exp: Ditto.
	* gdb.python/source2.py: Ditto.
	* gdb.python/lib-types.exp: Change print syntax for Python 3
	compatibility.
	Use sorted() function rather than sort() method.
	Accept either int or long values for enum values.
	* gdb.python/py-events.exp: Use exec(open(...).read()) instead of
	execfile for Python 3 compatibility.
	* gdb.python/py-evsignal.exp: Ditto.
	* gdb.python/py-evthreads.exp: Ditto.
	* gdb.python/py-mi.exp: Ditto.
	* gdb.python/py-pp-maint.exp: Ditto.
	* gdb.python/py-prettyprint.exp: Ditto.
	* gdb.python/py-finish-breakpoint.exp: Change print syntax for
	Python 3 compatibility.
	Skip tests for Python 2.4.
	* gdb.python/py-inferior.exp: Change print syntax for
	Python 3 compatibility.
	Use byte string rather than character string in memory write test
	if Python 3.
	* gdb.python/py-pp-maint.py: Change class declarations to "new
	class" syntax.
	* gdb.python/py-prettyprint.py: Change iterator class to generator
	function for Python 3 compatibility.
	Make all classes "new style".
	Fix indentation issue and stray semicolon.
	* gdb.python/py-shared.expChange print syntax for Python 3
	compatibility.
	Define "long" if Python 3.
	* gdb.python/py-type.exp: Change print syntax for Python 3
	compatibility.
	Accept either int or long values for enum values.
	* gdb.python/py-value.exp: Change print syntax for Python 3
	compatibility.
	Skip "long" and "unicode" tests if Python 3.
	Accept either "type" or "class" in type checks.
	* lib/gdb.exp (gdb_py_is_py3k): New flag set if Python 3.
	(gdb_py_is_py24): New flag set if Python 2.4 or 2.5.

1 files changed, 42 insertions, 42 deletions

diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.py b/gdb/testsuite/gdb.python/py-finish-breakpoint.py
index 2878bb8..3f9744d 100644
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint.py
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.py
@@ -15,75 +15,75 @@
 
 # This file is part of the GDB testsuite.  It tests python Finish
 # Breakpoints.
-		
+                
 class MyFinishBreakpoint (gdb.FinishBreakpoint):
-	def __init__(self, val, frame):
-		gdb.FinishBreakpoint.__init__ (self, frame)
-		print "MyFinishBreakpoint init"
-		self.val = val
-		
-	def stop(self):
-		print "MyFinishBreakpoint stop with %d" % int (self.val.dereference ())
-		print "return_value is: %d" % int (self.return_value)
-		gdb.execute ("where 1")
-		return True
-	
-	def out_of_scope(self):
-		print "MyFinishBreakpoint out of scope"
+        def __init__(self, val, frame):
+                gdb.FinishBreakpoint.__init__ (self, frame)
+                print ("MyFinishBreakpoint init")
+                self.val = val
+                
+        def stop(self):
+                print ("MyFinishBreakpoint stop with %d" % int (self.val.dereference ()))
+                print ("return_value is: %d" % int (self.return_value))
+                gdb.execute ("where 1")
+                return True
+        
+        def out_of_scope(self):
+                print ("MyFinishBreakpoint out of scope")
 
 class TestBreakpoint(gdb.Breakpoint):
     def __init__(self):
         gdb.Breakpoint.__init__ (self, spec="test_1", internal=1)
         self.silent = True
         self.count = 0
-        print "TestBreakpoint init"
+        print ("TestBreakpoint init")
         
     def stop(self):
-    	self.count += 1
-    	try:
-        	TestFinishBreakpoint (gdb.newest_frame (), self.count)
+        self.count += 1
+        try:
+                TestFinishBreakpoint (gdb.newest_frame (), self.count)
         except ValueError as e:
-        	print e
+                print (e)
         return False
 
 class TestFinishBreakpoint (gdb.FinishBreakpoint):
     def __init__ (self, frame, count):
-    	self.count = count
+        self.count = count
         gdb.FinishBreakpoint.__init__ (self, frame, internal=1)
         
         
     def stop(self):
-        print "-->", self.number
+        print ("-->", self.number)
         if (self.count == 3):
-            print "test stop: %d" % self.count
+            print ("test stop: %d" % self.count)
             return True
         else:
-            print "test don't stop: %d" % self.count
+            print ("test don't stop: %d" % self.count)
             return False 
         
     
     def out_of_scope(self):
-        print "test didn't finish: %d" % self.count
+        print ("test didn't finish: %d" % self.count)
 
 class TestExplicitBreakpoint(gdb.Breakpoint):
-	def stop(self):
-		try:
-			SimpleFinishBreakpoint (gdb.newest_frame ())
-		except ValueError as e:
-			print e
-		return False
+        def stop(self):
+                try:
+                        SimpleFinishBreakpoint (gdb.newest_frame ())
+                except ValueError as e:
+                        print (e)
+                return False
 
 class SimpleFinishBreakpoint(gdb.FinishBreakpoint):
-	def __init__(self, frame):
-		gdb.FinishBreakpoint.__init__ (self, frame)
-		
-		print "SimpleFinishBreakpoint init"
-		
-	def stop(self):
-		print "SimpleFinishBreakpoint stop" 
-		return True
-	
-	def out_of_scope(self):
-		print "SimpleFinishBreakpoint out of scope"
+        def __init__(self, frame):
+                gdb.FinishBreakpoint.__init__ (self, frame)
+                
+                print ("SimpleFinishBreakpoint init")
+                
+        def stop(self):
+                print ("SimpleFinishBreakpoint stop" )
+                return True
+        
+        def out_of_scope(self):
+                print ("SimpleFinishBreakpoint out of scope")
 
-print "Python script imported"
+print ("Python script imported")