[Python-checkins] python/dist/src/Lib/test test_symtable.py,1.4,1.5 test_syntax.py,1.2,1.3

jhylton@users.sourceforge.net jhylton@users.sourceforge.net
Tue, 15 Jul 2003 13:24:29 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv31672/test

Modified Files:
	test_symtable.py test_syntax.py 
Log Message:
SF patch 763201: handling of SyntaxErrors in symbol table build

Bug fix candidate.


Index: test_symtable.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_symtable.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_symtable.py	23 Jul 2002 19:04:05 -0000	1.4
--- test_symtable.py	15 Jul 2003 20:24:27 -0000	1.5
***************
*** 1,3 ****
! from test.test_support import verify
  
  import _symtable
--- 1,3 ----
! from test.test_support import vereq, TestFailed
  
  import _symtable
***************
*** 5,8 ****
  symbols = _symtable.symtable("def f(x): return x", "?", "exec")
  
! verify(symbols[0].name == "global")
! verify(len([ste for ste in symbols.values() if ste.name == "f"]) == 1)
--- 5,20 ----
  symbols = _symtable.symtable("def f(x): return x", "?", "exec")
  
! vereq(symbols[0].name, "global")
! vereq(len([ste for ste in symbols.values() if ste.name == "f"]), 1)
! 
! # Bug tickler: SyntaxError file name correct whether error raised
! # while parsing or building symbol table.
! def checkfilename(brokencode):
!     try:
!         _symtable.symtable(brokencode, "spam", "exec")
!     except SyntaxError, e:
!         vereq(e.filename, "spam")
!     else:
!         raise TestFailed("no SyntaxError for %r" % (brokencode,))
! checkfilename("def f(x): foo)(")  # parse-time
! checkfilename("def f(x): global x")  # symtable-build-time

Index: test_syntax.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_syntax.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_syntax.py	23 Jul 2002 19:04:06 -0000	1.2
--- test_syntax.py	15 Jul 2003 20:24:27 -0000	1.3
***************
*** 1,4 ****
--- 1,5 ----
  import re
  import unittest
+ import warnings
  
  from test import test_support
***************
*** 27,30 ****
--- 28,45 ----
      def test_assign_del(self):
          self._check_error("del f()", "delete")
+ 
+     def test_global_err_then_warn(self):
+         # Bug tickler:  The SyntaxError raised for one global statement
+         # shouldn't be clobbered by a SyntaxWarning issued for a later one.
+         source = re.sub('(?m)^ *:', '', """\
+             :def error(a):
+             :    global a  # SyntaxError
+             :def warning():
+             :    b = 1
+             :    global b  # SyntaxWarning
+             :""")
+         warnings.filterwarnings(action='ignore', category=SyntaxWarning)
+         self._check_error(source, "global")
+         warnings.filters.pop(0)
  
  def test_main():