Python 2.6/3.0 compatibility changes

50 files changed, 176 insertions, 147 deletions

diff --git a/test/calclex.py b/test/calclex.py
index 6ee9cb4..67d245f 100644
--- a/test/calclex.py
+++ b/test/calclex.py
@@ -28,7 +28,7 @@ def t_NUMBER(t):
     try:
         t.value = int(t.value)
     except ValueError:
-        print "Integer value too large", t.value
+        print("Integer value too large %s" % t.value)
         t.value = 0
     return t
 
@@ -39,7 +39,7 @@ def t_newline(t):
     t.lineno += t.value.count("\n")
     
 def t_error(t):
-    print "Illegal character '%s'" % t.value[0]
+    print("Illegal character '%s'" % t.value[0])
     t.lexer.skip(1)
     
 # Build the lexer
diff --git a/test/lex_closure.py b/test/lex_closure.py
index c2d8cdb..30ee679 100644
--- a/test/lex_closure.py
+++ b/test/lex_closure.py
@@ -30,7 +30,7 @@ def make_calc():
         try:
             t.value = int(t.value)
         except ValueError:
-            print "Integer value too large", t.value
+            print("Integer value too large %s" % t.value)
             t.value = 0
         return t
 
@@ -41,7 +41,7 @@ def make_calc():
         t.lineno += t.value.count("\n")
         
     def t_error(t):
-        print "Illegal character '%s'" % t.value[0]
+        print("Illegal character '%s'" % t.value[0])
         t.lexer.skip(1)
         
     # Build the lexer
diff --git a/test/lex_hedit.py b/test/lex_hedit.py
index 7d558c2..34f15a1 100644
--- a/test/lex_hedit.py
+++ b/test/lex_hedit.py
@@ -36,7 +36,7 @@ def t_H_EDIT_DESCRIPTOR(t):
     return t                                  
     
 def t_error(t):
-    print "Illegal character '%s'" % t.value[0]
+    print("Illegal character '%s'" % t.value[0])
     t.lexer.skip(1)
     
 # Build the lexer
diff --git a/test/lex_many_tokens.py b/test/lex_many_tokens.py
index 3558b1a..77ae12b 100644
--- a/test/lex_many_tokens.py
+++ b/test/lex_many_tokens.py
@@ -11,7 +11,10 @@ import ply.lex as lex
 tokens = ["TOK%d" % i for i in range(1000)]
 
 for tok in tokens:
-    exec "t_%s = '%s:'" % (tok,tok)
+    if sys.version_info[0] < 3:
+        exec("t_%s = '%s:'" % (tok,tok))
+    else:
+        exec("t_%s = '%s:'" % (tok,tok), globals())
 
 t_ignore = " \t"
 
diff --git a/test/lex_module_import.py b/test/lex_module_import.py
index 81eacdb..df42082 100644
--- a/test/lex_module_import.py
+++ b/test/lex_module_import.py
@@ -26,7 +26,7 @@ def t_NUMBER(t):
     try:
         t.value = int(t.value)
     except ValueError:
-        print "Integer value too large", t.value
+        print("Integer value too large %s" % t.value)
         t.value = 0
     return t
 
@@ -37,6 +37,6 @@ def t_newline(t):
     t.lineno += t.value.count("\n")
     
 def t_error(t):
-    print "Illegal character '%s'" % t.value[0]
+    print("Illegal character '%s'" % t.value[0])
     t.lexer.skip(1)
     
diff --git a/test/lex_object.py b/test/lex_object.py
index e10c95b..7e9f389 100644
--- a/test/lex_object.py
+++ b/test/lex_object.py
@@ -29,7 +29,7 @@ class CalcLexer:
         try:
             t.value = int(t.value)
         except ValueError:
-            print "Integer value too large", t.value
+            print("Integer value too large %s" % t.value)
             t.value = 0
         return t
 
@@ -40,7 +40,7 @@ class CalcLexer:
         t.lineno += t.value.count("\n")
         
     def t_error(self,t):
-        print "Illegal character '%s'" % t.value[0]
+        print("Illegal character '%s'" % t.value[0])
         t.lexer.skip(1)
         
 
diff --git a/test/lex_opt_alias.py b/test/lex_opt_alias.py
index dd6e288..5d5ed4c 100644
--- a/test/lex_opt_alias.py
+++ b/test/lex_opt_alias.py
@@ -29,7 +29,7 @@ def NUMBER(t):
     try:
         t.value = int(t.value)
     except ValueError:
-        print "Integer value too large", t.value
+        print("Integer value too large %s" % t.value)
         t.value = 0
     return t
 
@@ -43,7 +43,7 @@ def t_newline(t):
     t.lexer.lineno += t.value.count("\n")
     
 def t_error(t):
-    print "Illegal character '%s'" % t.value[0]
+    print("Illegal character '%s'" % t.value[0])
     t.lexer.skip(1)
 
 t_spam_error = t_error
diff --git a/test/lex_optimize.py b/test/lex_optimize.py
index e8e44e1..0e447e6 100644
--- a/test/lex_optimize.py
+++ b/test/lex_optimize.py
@@ -28,7 +28,7 @@ def t_NUMBER(t):
     try:
         t.value = int(t.value)
     except ValueError:
-        print "Integer value too large", t.value
+        print("Integer value too large %s" % t.value)
         t.value = 0
     return t
 
@@ -39,7 +39,7 @@ def t_newline(t):
     t.lineno += t.value.count("\n")
     
 def t_error(t):
-    print "Illegal character '%s'" % t.value[0]
+    print("Illegal character '%s'" % t.value[0])
     t.lexer.skip(1)
     
 # Build the lexer
diff --git a/test/lex_optimize3.py b/test/lex_optimize3.py
index e20df83..c6c8cce 100644
--- a/test/lex_optimize3.py
+++ b/test/lex_optimize3.py
@@ -30,7 +30,7 @@ def t_NUMBER(t):
     try:
         t.value = int(t.value)
     except ValueError:
-        print "Integer value too large", t.value
+        print("Integer value too large %s" % t.value)
         t.value = 0
     return t
 
@@ -41,7 +41,7 @@ def t_newline(t):
     t.lineno += t.value.count("\n")
     
 def t_error(t):
-    print "Illegal character '%s'" % t.value[0]
+    print("Illegal character '%s'" % t.value[0])
     t.lexer.skip(1)
     
 # Build the lexer
diff --git a/test/lex_state1.py b/test/lex_state1.py
index 881fec9..7528c91 100644
--- a/test/lex_state1.py
+++ b/test/lex_state1.py
@@ -23,11 +23,11 @@ t_NUMBER = r'\d+'
 def t_comment(t):
     r'/\*'
     t.lexer.begin('comment')
-    print "Entering comment state"
+    print("Entering comment state")
 
 def t_comment_body_part(t):
     r'(.|\n)*\*/'
-    print "comment body", t
+    print("comment body %s" % t)
     t.lexer.begin('INITIAL')
 
 def t_error(t):
diff --git a/test/lex_state2.py b/test/lex_state2.py
index 49dd66d..3aef69e 100644
--- a/test/lex_state2.py
+++ b/test/lex_state2.py
@@ -23,11 +23,11 @@ t_NUMBER = r'\d+'
 def t_comment(t):
     r'/\*'
     t.lexer.begin('comment')
-    print "Entering comment state"
+    print("Entering comment state")
 
 def t_comment_body_part(t):
     r'(.|\n)*\*/'
-    print "comment body", t
+    print("comment body %s" % t)
     t.lexer.begin('INITIAL')
 
 def t_error(t):
diff --git a/test/lex_state3.py b/test/lex_state3.py
index d9c9c78..616e484 100644
--- a/test/lex_state3.py
+++ b/test/lex_state3.py
@@ -25,11 +25,11 @@ t_NUMBER = r'\d+'
 def t_comment(t):
     r'/\*'
     t.lexer.begin('comment')
-    print "Entering comment state"
+    print("Entering comment state")
 
 def t_comment_body_part(t):
     r'(.|\n)*\*/'
-    print "comment body", t
+    print("comment body %s" % t)
     t.lexer.begin('INITIAL')
 
 def t_error(t):
diff --git a/test/lex_state4.py b/test/lex_state4.py
index 681f205..1825016 100644
--- a/test/lex_state4.py
+++ b/test/lex_state4.py
@@ -24,11 +24,11 @@ t_NUMBER = r'\d+'
 def t_comment(t):
     r'/\*'
     t.lexer.begin('comment')
-    print "Entering comment state"
+    print("Entering comment state")
 
 def t_comment_body_part(t):
     r'(.|\n)*\*/'
-    print "comment body", t
+    print("comment body %s" % t)
     t.lexer.begin('INITIAL')
 
 def t_error(t):
diff --git a/test/lex_state5.py b/test/lex_state5.py
index 2ede0b6..4ce828e 100644
--- a/test/lex_state5.py
+++ b/test/lex_state5.py
@@ -24,11 +24,11 @@ t_NUMBER = r'\d+'
 def t_comment(t):
     r'/\*'
     t.lexer.begin('comment')
-    print "Entering comment state"
+    print("Entering comment state")
 
 def t_comment_body_part(t):
     r'(.|\n)*\*/'
-    print "comment body", t
+    print("comment body %s" % t)
     t.lexer.begin('INITIAL')
 
 def t_error(t):
diff --git a/test/lex_state_noerror.py b/test/lex_state_noerror.py
index 2cb008b..90bbea8 100644
--- a/test/lex_state_noerror.py
+++ b/test/lex_state_noerror.py
@@ -23,11 +23,11 @@ t_NUMBER = r'\d+'
 def t_comment(t):
     r'/\*'
     t.lexer.begin('comment')
-    print "Entering comment state"
+    print("Entering comment state")
 
 def t_comment_body_part(t):
     r'(.|\n)*\*/'
-    print "comment body", t
+    print("comment body %s" % t)
     t.lexer.begin('INITIAL')
 
 def t_error(t):
diff --git a/test/lex_state_norule.py b/test/lex_state_norule.py
index 3037c83..64ec6d3 100644
--- a/test/lex_state_norule.py
+++ b/test/lex_state_norule.py
@@ -24,11 +24,11 @@ t_NUMBER = r'\d+'
 def t_comment(t):
     r'/\*'
     t.lexer.begin('comment')
-    print "Entering comment state"
+    print("Entering comment state")
 
 def t_comment_body_part(t):
     r'(.|\n)*\*/'
-    print "comment body", t
+    print("comment body %s" % t)
     t.lexer.begin('INITIAL')
 
 def t_error(t):
diff --git a/test/lex_state_try.py b/test/lex_state_try.py
index 8eb6762..fd5ba22 100644
--- a/test/lex_state_try.py
+++ b/test/lex_state_try.py
@@ -25,11 +25,11 @@ t_ignore = " \t"
 def t_comment(t):
     r'/\*'
     t.lexer.begin('comment')
-    print "Entering comment state"
+    print("Entering comment state")
 
 def t_comment_body_part(t):
     r'(.|\n)*\*/'
-    print "comment body", t
+    print("comment body %s" % t)
     t.lexer.begin('INITIAL')
 
 def t_error(t):
diff --git a/test/testlex.py b/test/testlex.py
index 953206c..ed7f4e4 100755
--- a/test/testlex.py
+++ b/test/testlex.py
@@ -1,7 +1,11 @@
 # testlex.py
 
 import unittest
-import StringIO
+try:
+    import StringIO
+except ImportError:
+    import io as StringIO
+
 import sys
 sys.path.insert(0,"..")
 sys.tracebacklimit = 0
@@ -9,10 +13,18 @@ sys.tracebacklimit = 0
 import ply.lex
 
 def check_expected(result,expected):
+    if sys.version_info[0] >= 3:
+        if isinstance(result,str):
+            result = result.encode('ascii')
+        if isinstance(expected,str):
+            expected = expected.encode('ascii')
     resultlines = result.splitlines()
     expectedlines = expected.splitlines()
+
+
     if len(resultlines) != len(expectedlines):
         return False
+
     for rline,eline in zip(resultlines,expectedlines):
         if not rline.endswith(eline):
             return False
@@ -20,7 +32,7 @@ def check_expected(result,expected):
 
 def run_import(module):
     code = "import "+module
-    exec code
+    exec(code)
     del sys.modules[module]
     
 # Tests related to errors and warnings when building lexers
@@ -57,8 +69,8 @@ class LexErrorWarningTests(unittest.TestCase):
     def test_lex_empty(self):
         try:
             run_import("lex_empty")
-        except SyntaxError,e:
-            pass
+        except SyntaxError:
+            e = sys.exc_info()[1]
         self.assertEquals(str(e),"lex: no rules of the form t_rulename are defined.")
 
     def test_lex_error1(self):
@@ -70,8 +82,8 @@ class LexErrorWarningTests(unittest.TestCase):
     def test_lex_error2(self):
         try:
             run_import("lex_error2")
-        except SyntaxError,e:
-            pass
+        except SyntaxError:
+            e = sys.exc_info()[1]
         self.assertEquals(str(e),"lex: Rule 't_error' must be defined as a function")
 
     def test_lex_error3(self):
@@ -189,16 +201,16 @@ class LexErrorWarningTests(unittest.TestCase):
     def test_lex_token1(self):
         try:
             run_import("lex_token1")
-        except SyntaxError,e:
-            pass
+        except SyntaxError:
+            e = sys.exc_info()[1]
         self.assertEquals(str(e),"lex: module does not define 'tokens'")
 
 
     def test_lex_token2(self):
         try:
             run_import("lex_token2")
-        except SyntaxError,e:
-            pass
+        except SyntaxError:
+            e = sys.exc_info()[1]
         self.assertEquals(str(e),"lex: tokens must be a list or tuple.")
 
     
@@ -219,8 +231,8 @@ class LexErrorWarningTests(unittest.TestCase):
     def test_lex_token5(self):
         try:
             run_import("lex_token5")
-        except ply.lex.LexError,e:
-            pass
+        except ply.lex.LexError:
+            e = sys.exc_info()[1]
         self.assert_(check_expected(str(e),"lex_token5.py:19: Rule 't_NUMBER' returned an unknown token type 'NUM'"))
 
     def test_lex_token_dup(self):
@@ -296,6 +308,7 @@ class LexBuildOptionTests(unittest.TestCase):
         except OSError:
             pass
         run_import("lex_optimize")
+
         result = sys.stdout.getvalue()
         self.assert_(check_expected(result,
                                     "(NUMBER,3,1,0)\n"
@@ -303,16 +316,19 @@ class LexBuildOptionTests(unittest.TestCase):
                                     "(NUMBER,4,1,2)\n"))
         self.assert_(os.path.exists("lextab.py"))
 
-        p = subprocess.Popen(['python','-O','lex_optimize.py'],
+
+        p = subprocess.Popen([sys.executable,'-O','lex_optimize.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
+
         self.assert_(check_expected(result,
                                     "(NUMBER,3,1,0)\n"
                                     "(PLUS,'+',1,1)\n"
                                     "(NUMBER,4,1,2)\n"))
         self.assert_(os.path.exists("lextab.pyo"))
+
         os.remove("lextab.pyo")
-        p = subprocess.Popen(['python','-OO','lex_optimize.py'],
+        p = subprocess.Popen([sys.executable,'-OO','lex_optimize.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
         self.assert_(check_expected(result,
@@ -354,7 +370,7 @@ class LexBuildOptionTests(unittest.TestCase):
                                     "(NUMBER,4,1,2)\n"))
         self.assert_(os.path.exists("opt2tab.py"))
 
-        p = subprocess.Popen(['python','-O','lex_optimize2.py'],
+        p = subprocess.Popen([sys.executable,'-O','lex_optimize2.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
         self.assert_(check_expected(result,
@@ -363,7 +379,7 @@ class LexBuildOptionTests(unittest.TestCase):
                                     "(NUMBER,4,1,2)\n"))
         self.assert_(os.path.exists("opt2tab.pyo"))
         os.remove("opt2tab.pyo")
-        p = subprocess.Popen(['python','-OO','lex_optimize2.py'],
+        p = subprocess.Popen([sys.executable,'-OO','lex_optimize2.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
         self.assert_(check_expected(result,
@@ -402,7 +418,7 @@ class LexBuildOptionTests(unittest.TestCase):
                                     "(NUMBER,4,1,2)\n"))
         self.assert_(os.path.exists("lexdir/sub/calctab.py"))
 
-        p = subprocess.Popen(['python','-O','lex_optimize3.py'],
+        p = subprocess.Popen([sys.executable,'-O','lex_optimize3.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
         self.assert_(check_expected(result,
@@ -411,7 +427,7 @@ class LexBuildOptionTests(unittest.TestCase):
                                     "(NUMBER,4,1,2)\n"))
         self.assert_(os.path.exists("lexdir/sub/calctab.pyo"))
         os.remove("lexdir/sub/calctab.pyo")
-        p = subprocess.Popen(['python','-OO','lex_optimize3.py'],
+        p = subprocess.Popen([sys.executable,'-OO','lex_optimize3.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
         self.assert_(check_expected(result,
@@ -445,7 +461,7 @@ class LexBuildOptionTests(unittest.TestCase):
                                     "(NUMBER,4,1,2)\n"))
         self.assert_(os.path.exists("aliastab.py"))
 
-        p = subprocess.Popen(['python','-O','lex_opt_alias.py'],
+        p = subprocess.Popen([sys.executable,'-O','lex_opt_alias.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
         self.assert_(check_expected(result,
@@ -454,7 +470,7 @@ class LexBuildOptionTests(unittest.TestCase):
                                     "(NUMBER,4,1,2)\n"))
         self.assert_(os.path.exists("aliastab.pyo"))
         os.remove("aliastab.pyo")
-        p = subprocess.Popen(['python','-OO','lex_opt_alias.py'],
+        p = subprocess.Popen([sys.executable,'-OO','lex_opt_alias.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
         self.assert_(check_expected(result,
@@ -502,7 +518,7 @@ class LexBuildOptionTests(unittest.TestCase):
 
         self.assert_(os.path.exists("manytab.py"))
 
-        p = subprocess.Popen(['python','-O','lex_many_tokens.py'],
+        p = subprocess.Popen([sys.executable,'-O','lex_many_tokens.py'],
                              stdout=subprocess.PIPE)
         result = p.stdout.read()
         self.assert_(check_expected(result,
diff --git a/test/testyacc.py b/test/testyacc.py
index 08fb007..64d41e3 100644
--- a/test/testyacc.py
+++ b/test/testyacc.py
@@ -1,7 +1,11 @@
 # testyacc.py
 
 import unittest
-import StringIO
+try:
+    import StringIO
+except ImportError:
+    import io as StringIO
+
 import sys
 import os
 
@@ -22,7 +26,7 @@ def check_expected(result,expected):
 
 def run_import(module):
     code = "import "+module
-    exec code
+    exec(code)
     del sys.modules[module]
     
 # Tests related to errors and warnings when building parsers
@@ -57,7 +61,8 @@ class YaccErrorWarningTests(unittest.TestCase):
     def test_yacc_badprec(self):
         try:
             run_import("yacc_badprec")
-        except ply.yacc.YaccError,e:
+        except ply.yacc.YaccError:
+            e = sys.exc_info()[1]
             self.assert_(check_expected(str(e),
                                         "precedence must be a list or tuple."))
     def test_yacc_badprec2(self):
@@ -90,7 +95,8 @@ class YaccErrorWarningTests(unittest.TestCase):
     def test_yacc_badtok(self):
         try:
             run_import("yacc_badtok")
-        except ply.yacc.YaccError,e:
+        except ply.yacc.YaccError:
+            e = sys.exc_info()[1]
             self.assert_(check_expected(str(e),
                                         "tokens must be a list or tuple."))
 
@@ -106,21 +112,24 @@ class YaccErrorWarningTests(unittest.TestCase):
     def test_yacc_error1(self):
         try:
             run_import("yacc_error1")
-        except ply.yacc.YaccError,e:
+        except ply.yacc.YaccError:
+            e = sys.exc_info()[1]
             self.assert_(check_expected(str(e),
                                         "yacc_error1.py:61: p_error() requires 1 argument."))
 
     def test_yacc_error2(self):
         try:
             run_import("yacc_error2")
-        except ply.yacc.YaccError,e:
+        except ply.yacc.YaccError:
+            e = sys.exc_info()[1]
             self.assert_(check_expected(str(e),
                                         "yacc_error2.py:61: p_error() requires 1 argument."))
 
     def test_yacc_error3(self):
         try:
             run_import("yacc_error3")
-        except ply.yacc.YaccError,e:
+        except ply.yacc.YaccError:
+            e = sys.exc_info()[1]
             self.assert_(check_expected(str(e),
                                         "'p_error' defined, but is not a function or method."))
             
@@ -205,7 +214,8 @@ class YaccErrorWarningTests(unittest.TestCase):
     def test_yacc_notok(self):
         try:
             run_import("yacc_notok")
-        except ply.yacc.YaccError,e:
+        except ply.yacc.YaccError:
+            e = sys.exc_info()[1]
             self.assert_(check_expected(str(e),
                                         "module does not define a list 'tokens'"))
 
diff --git a/test/yacc_badargs.py b/test/yacc_badargs.py
index 0a6fd86..9a1d03f 100644
--- a/test/yacc_badargs.py
+++ b/test/yacc_badargs.py
@@ -26,7 +26,7 @@ def p_statement_assign(t,s):
 
 def p_statement_expr():
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_badid.py b/test/yacc_badid.py
index 8a21932..1df351c 100644
--- a/test/yacc_badid.py
+++ b/test/yacc_badid.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_statement_expr(t):
     'statement : bad&rule'
@@ -64,7 +64,7 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
diff --git a/test/yacc_badprec.py b/test/yacc_badprec.py
index ed2e3db..3013bb6 100644
--- a/test/yacc_badprec.py
+++ b/test/yacc_badprec.py
@@ -22,7 +22,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -51,11 +51,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_badprec2.py b/test/yacc_badprec2.py
index c1e2705..83093b4 100644
--- a/test/yacc_badprec2.py
+++ b/test/yacc_badprec2.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_badprec3.py b/test/yacc_badprec3.py
index 5998dd0..d925ecd 100644
--- a/test/yacc_badprec3.py
+++ b/test/yacc_badprec3.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_badrule.py b/test/yacc_badrule.py
index b873c8c..92af646 100644
--- a/test/yacc_badrule.py
+++ b/test/yacc_badrule.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_badtok.py b/test/yacc_badtok.py
index 3b6db6b..fc4afe1 100644
--- a/test/yacc_badtok.py
+++ b/test/yacc_badtok.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_dup.py b/test/yacc_dup.py
index 1d2fa7d..309ba32 100644
--- a/test/yacc_dup.py
+++ b/test/yacc_dup.py
@@ -26,7 +26,7 @@ def p_statement(t):
 
 def p_statement(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_error1.py b/test/yacc_error1.py
index e14c729..10ac6a9 100644
--- a/test/yacc_error1.py
+++ b/test/yacc_error1.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t,s):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_error2.py b/test/yacc_error2.py
index fed3e23..7591418 100644
--- a/test/yacc_error2.py
+++ b/test/yacc_error2.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error():
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_error3.py b/test/yacc_error3.py
index c54f980..4604a48 100644
--- a/test/yacc_error3.py
+++ b/test/yacc_error3.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,7 +55,7 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 p_error = "blah"
diff --git a/test/yacc_error4.py b/test/yacc_error4.py
index aebb01d..9c550cd 100644
--- a/test/yacc_error4.py
+++ b/test/yacc_error4.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,7 +55,7 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error_handler(t):
diff --git a/test/yacc_inf.py b/test/yacc_inf.py
index 7c2aa21..efd3612 100644
--- a/test/yacc_inf.py
+++ b/test/yacc_inf.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -47,7 +47,7 @@ def p_expression_group(t):
     t[0] = t[2]
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_literal.py b/test/yacc_literal.py
index 915dd6e..0d62803 100644
--- a/test/yacc_literal.py
+++ b/test/yacc_literal.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression '+' expression
@@ -56,11 +56,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_misplaced.py b/test/yacc_misplaced.py
index 150f9c1..9159b01 100644
--- a/test/yacc_misplaced.py
+++ b/test/yacc_misplaced.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''           | expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_missing1.py b/test/yacc_missing1.py
index 2d0c9e6..d1b5105 100644
--- a/test/yacc_missing1.py
+++ b/test/yacc_missing1.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_nested.py b/test/yacc_nested.py
index 4c85013..a1b061e 100644
--- a/test/yacc_nested.py
+++ b/test/yacc_nested.py
@@ -24,7 +24,7 @@ def p_start(t):
 
 def p_nest(t):
    '''nest : B'''
-   print t[-1]
+   print(t[-1])
 
 the_parser = yacc.yacc(debug = False, write_tables = False)
 
diff --git a/test/yacc_nodoc.py b/test/yacc_nodoc.py
index 6b662a5..0f61920 100644
--- a/test/yacc_nodoc.py
+++ b/test/yacc_nodoc.py
@@ -25,7 +25,7 @@ def p_statement_assign(t):
     names[t[1]] = t[3]
 
 def p_statement_expr(t):
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -54,11 +54,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_noerror.py b/test/yacc_noerror.py
index 7da6309..b38c758 100644
--- a/test/yacc_noerror.py
+++ b/test/yacc_noerror.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,7 +55,7 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 
diff --git a/test/yacc_nop.py b/test/yacc_nop.py
index c6caa52..789a9cf 100644
--- a/test/yacc_nop.py
+++ b/test/yacc_nop.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_notfunc.py b/test/yacc_notfunc.py
index 384a267..5093a74 100644
--- a/test/yacc_notfunc.py
+++ b/test/yacc_notfunc.py
@@ -24,7 +24,7 @@ p_statement_assign = "Blah"
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -53,11 +53,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_notok.py b/test/yacc_notok.py
index d4f901a..cff55a8 100644
--- a/test/yacc_notok.py
+++ b/test/yacc_notok.py
@@ -25,7 +25,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -54,11 +54,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_prec1.py b/test/yacc_prec1.py
index 6d7ad98..2ca6afc 100644
--- a/test/yacc_prec1.py
+++ b/test/yacc_prec1.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_rr.py b/test/yacc_rr.py
index 86c70b7..e7336c2 100644
--- a/test/yacc_rr.py
+++ b/test/yacc_rr.py
@@ -30,7 +30,7 @@ def p_statement_assign_2(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -59,11 +59,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_simple.py b/test/yacc_simple.py
index 7ff336c..bd989f4 100644
--- a/test/yacc_simple.py
+++ b/test/yacc_simple.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_sr.py b/test/yacc_sr.py
index 055efe3..69a1e9c 100644
--- a/test/yacc_sr.py
+++ b/test/yacc_sr.py
@@ -21,7 +21,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -50,11 +50,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_term1.py b/test/yacc_term1.py
index c0756dd..eaa36e9 100644
--- a/test/yacc_term1.py
+++ b/test/yacc_term1.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,11 +55,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_unused.py b/test/yacc_unused.py
index b51a7f1..55b677b 100644
--- a/test/yacc_unused.py
+++ b/test/yacc_unused.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,7 +55,7 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_expr_list(t):
@@ -68,7 +68,7 @@ def p_expr_list_2(t):
 
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_unused_rule.py b/test/yacc_unused_rule.py
index 4a336db..4868ef8 100644
--- a/test/yacc_unused_rule.py
+++ b/test/yacc_unused_rule.py
@@ -26,7 +26,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -55,7 +55,7 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_integer(t):
@@ -63,7 +63,7 @@ def p_integer(t):
     t[0] = t[1]
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_uprec.py b/test/yacc_uprec.py
index 3702f6f..569adb8 100644
--- a/test/yacc_uprec.py
+++ b/test/yacc_uprec.py
@@ -21,7 +21,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -50,11 +50,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()
 
diff --git a/test/yacc_uprec2.py b/test/yacc_uprec2.py
index d7b1f0d..73274bf 100644
--- a/test/yacc_uprec2.py
+++ b/test/yacc_uprec2.py
@@ -21,7 +21,7 @@ def p_statement_assign(t):
 
 def p_statement_expr(t):
     'statement : expression'
-    print t[1]
+    print(t[1])
 
 def p_expression_binop(t):
     '''expression : expression PLUS expression
@@ -50,11 +50,11 @@ def p_expression_name(t):
     try:
         t[0] = names[t[1]]
     except LookupError:
-        print "Undefined name '%s'" % t[1]
+        print("Undefined name '%s'" % t[1])
         t[0] = 0
 
 def p_error(t):
-    print "Syntax error at '%s'" % t.value
+    print("Syntax error at '%s'" % t.value)
 
 yacc.yacc()