Author: brett.cannon Date: Wed Feb 28 22:02:25 2007 New Revision: 54037 Modified: python/branches/p3yk_no_args_on_exc/ (props changed) python/branches/p3yk_no_args_on_exc/Lib/keyword.py Log: Merged revisions 54011-54036 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r54035 | jack.diederich | 2007-02-28 14:21:30 -0600 (Wed, 28 Feb 2007) | 1 line regenerated to reflect the addition of 'nonlocal' and removal of 'print' ........ Modified: python/branches/p3yk_no_args_on_exc/Lib/keyword.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/keyword.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/keyword.py Wed Feb 28 22:02:25 2007 @@ -34,10 +34,10 @@ 'in', 'is', 'lambda', + 'nonlocal', 'not', 'or', 'pass', - 'print', 'raise', 'return', 'try',