[Python-checkins] python/dist/src/Lib pyclbr.py, 1.32, 1.33 symbol.py, 1.16, 1.17 token.py, 1.13, 1.14 tokenize.py, 1.35, 1.36

Mon Aug 2 08:10:26 CEST 2004

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6086/Lib
Modified Files:
	pyclbr.py symbol.py token.py tokenize.py 
Log Message:
PEP-0318, @decorator-style. In Guido's words:
"@ seems the syntax that everybody can hate equally"
Implementation by Mark Russell, from SF #979728.
Index: pyclbr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pyclbr.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** pyclbr.py	17 Dec 2003 20:43:32 -0000	1.32
--- pyclbr.py	2 Aug 2004 06:09:53 -0000	1.33
***************
*** 223,227 ****
 super.append(token)
 inherit = names
! cur_class = Class(module, class_name, inherit, file, lineno)
 if not stack:
 dict[class_name] = cur_class
--- 223,227 ----
 super.append(token)
 inherit = names
! cur_class = Class(fullmodule, class_name, inherit, file, lineno)
 if not stack:
 dict[class_name] = cur_class
Index: symbol.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/symbol.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** symbol.py	19 May 2004 08:20:05 -0000	1.16
--- symbol.py	2 Aug 2004 06:09:53 -0000	1.17
***************
*** 14,86 ****
 file_input = 257
 eval_input = 258
! funcdef = 259
! parameters = 260
! varargslist = 261
! fpdef = 262
! fplist = 263
! stmt = 264
! simple_stmt = 265
! small_stmt = 266
! expr_stmt = 267
! augassign = 268
! print_stmt = 269
! del_stmt = 270
! pass_stmt = 271
! flow_stmt = 272
! break_stmt = 273
! continue_stmt = 274
! return_stmt = 275
! yield_stmt = 276
! raise_stmt = 277
! import_stmt = 278
! import_as_name = 279
! dotted_as_name = 280
! dotted_name = 281
! global_stmt = 282
! exec_stmt = 283
! assert_stmt = 284
! compound_stmt = 285
! if_stmt = 286
! while_stmt = 287
! for_stmt = 288
! try_stmt = 289
! except_clause = 290
! suite = 291
! test = 292
! and_test = 293
! not_test = 294
! comparison = 295
! comp_op = 296
! expr = 297
! xor_expr = 298
! and_expr = 299
! shift_expr = 300
! arith_expr = 301
! term = 302
! factor = 303
! power = 304
! atom = 305
! listmaker = 306
! testlist_gexp = 307
! lambdef = 308
! trailer = 309
! subscriptlist = 310
! subscript = 311
! sliceop = 312
! exprlist = 313
! testlist = 314
! testlist_safe = 315
! dictmaker = 316
! classdef = 317
! arglist = 318
! argument = 319
! list_iter = 320
! list_for = 321
! list_if = 322
! gen_iter = 323
! gen_for = 324
! gen_if = 325
! testlist1 = 326
! encoding_decl = 327
 #--end constants--
 
--- 14,88 ----
 file_input = 257
 eval_input = 258
! decorator = 259
! decorators = 260
! funcdef = 261
! parameters = 262
! varargslist = 263
! fpdef = 264
! fplist = 265
! stmt = 266
! simple_stmt = 267
! small_stmt = 268
! expr_stmt = 269
! augassign = 270
! print_stmt = 271
! del_stmt = 272
! pass_stmt = 273
! flow_stmt = 274
! break_stmt = 275
! continue_stmt = 276
! return_stmt = 277
! yield_stmt = 278
! raise_stmt = 279
! import_stmt = 280
! import_as_name = 281
! dotted_as_name = 282
! dotted_name = 283
! global_stmt = 284
! exec_stmt = 285
! assert_stmt = 286
! compound_stmt = 287
! if_stmt = 288
! while_stmt = 289
! for_stmt = 290
! try_stmt = 291
! except_clause = 292
! suite = 293
! test = 294
! and_test = 295
! not_test = 296
! comparison = 297
! comp_op = 298
! expr = 299
! xor_expr = 300
! and_expr = 301
! shift_expr = 302
! arith_expr = 303
! term = 304
! factor = 305
! power = 306
! atom = 307
! listmaker = 308
! testlist_gexp = 309
! lambdef = 310
! trailer = 311
! subscriptlist = 312
! subscript = 313
! sliceop = 314
! exprlist = 315
! testlist = 316
! testlist_safe = 317
! dictmaker = 318
! classdef = 319
! arglist = 320
! argument = 321
! list_iter = 322
! list_for = 323
! list_if = 324
! gen_iter = 325
! gen_for = 326
! gen_if = 327
! testlist1 = 328
! encoding_decl = 329
 #--end constants--
 
Index: token.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/token.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** token.py	3 Oct 2002 09:42:01 -0000	1.13
--- token.py	2 Aug 2004 06:09:53 -0000	1.14
***************
*** 61,67 ****
 DOUBLESLASH = 48
 DOUBLESLASHEQUAL = 49
! OP = 50
! ERRORTOKEN = 51
! N_TOKENS = 52
 NT_OFFSET = 256
 #--end constants--
--- 61,68 ----
 DOUBLESLASH = 48
 DOUBLESLASHEQUAL = 49
! AT = 50
! OP = 51
! ERRORTOKEN = 52
! N_TOKENS = 53
 NT_OFFSET = 256
 #--end constants--
Index: tokenize.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/tokenize.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** tokenize.py	27 Feb 2003 20:14:42 -0000	1.35
--- tokenize.py	2 Aug 2004 06:09:53 -0000	1.36
***************
*** 84,88 ****
 
 Bracket = '[][(){}]'
! Special = group(r'\r?\n', r'[:;.,`]')
 Funny = group(Operator, Bracket, Special)
 
--- 84,88 ----
 
 Bracket = '[][(){}]'
! Special = group(r'\r?\n', r'[:;.,`@]')
 Funny = group(Operator, Bracket, Special)