[Python-checkins] CVS: python/dist/src/Modules _tkinter.c,1.115.6.1,1.115.6.2 parsermodule.c,2.60.6.1,2.60.6.2

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv7540/descr/dist/src/Modules

Modified Files:
      Tag: descr-branch
	_tkinter.c parsermodule.c 
Log Message:
Last trunk->branch merge for today <ahem>.


Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.115.6.1
retrieving revision 1.115.6.2
diff -C2 -r1.115.6.1 -r1.115.6.2
*** _tkinter.c	2001/07/07 22:55:29	1.115.6.1
--- _tkinter.c	2001/07/17 04:19:05	1.115.6.2
***************
*** 58,62 ****
  #endif
  
! #if !(defined(MS_WINDOWS) || defined(__CYGWIN__))
  #define HAVE_CREATEFILEHANDLER
  #endif
--- 58,63 ----
  #endif
  
! #if !(defined(MS_WINDOWS) || defined(__CYGWIN__) || defined(macintosh))
! /* Mac has it, but it doesn't really work:-( */
  #define HAVE_CREATEFILEHANDLER
  #endif

Index: parsermodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/parsermodule.c,v
retrieving revision 2.60.6.1
retrieving revision 2.60.6.2
diff -C2 -r2.60.6.1 -r2.60.6.2
*** parsermodule.c	2001/07/07 22:55:29	2.60.6.1
--- parsermodule.c	2001/07/17 04:19:05	2.60.6.2
***************
*** 831,835 ****
  VALIDATER(exprlist);            VALIDATER(dictmaker);
  VALIDATER(arglist);             VALIDATER(argument);
! VALIDATER(listmaker);
  
  #undef VALIDATER
--- 831,835 ----
  VALIDATER(exprlist);            VALIDATER(dictmaker);
  VALIDATER(arglist);             VALIDATER(argument);
! VALIDATER(listmaker);           VALIDATER(yield_stmt);
  
  #undef VALIDATER
***************
*** 1539,1543 ****
--- 1539,1555 ----
  
  
+ /* yield_stmt: 'yield' testlist
+  */
  static int
+ validate_yield_stmt(node *tree)
+ {
+     return (validate_ntype(tree, yield_stmt)
+             && validate_numnodes(tree, 2, "yield_stmt")
+             && validate_name(CHILD(tree, 0), "yield")
+             && validate_testlist(CHILD(tree, 1)));
+ }
+ 
+ 
+ static int
  validate_import_as_name(node *tree)
  {
***************
*** 2556,2559 ****
--- 2568,2572 ----
                      && ((TYPE(CHILD(tree, 0)) == break_stmt)
                          || (TYPE(CHILD(tree, 0)) == continue_stmt)
+                         || (TYPE(CHILD(tree, 0)) == yield_stmt)
                          || (TYPE(CHILD(tree, 0)) == return_stmt)
                          || (TYPE(CHILD(tree, 0)) == raise_stmt)));
***************
*** 2562,2565 ****
--- 2575,2581 ----
              else if (nch == 1)
                  err_string("illegal flow_stmt type");
+             break;
+           case yield_stmt:
+             res = validate_yield_stmt(tree);
              break;
              /*