[Python-checkins] python/nondist/peps pep-0000.txt,1.287,1.288

[anthonybaxter at users.sourceforge.net]

Update of /cvsroot/python/python/nondist/peps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14628

Modified Files:
	pep-0000.txt 
Log Message:
pep318 is accepted

Index: pep-0000.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- pep-0000.txt	27 Aug 2004 20:28:57 -0000	1.287
+++ pep-0000.txt	1 Sep 2004 16:18:20 -0000	1.288
@@ -66,6 +66,7 @@
  S   252  Making Types Look More Like Classes          GvR
  S   253  Subtyping Built-in Types                     GvR
  SA  309  Partial Function Application                 Harris
+ SA  318  Decorators for Functions and Methods         Smith, et al
  SA  328  Imports: Multi-Line and Absolute/Relative    Aahz
 
  Open PEPs (under consideration)
@@ -112,7 +113,6 @@
  S   313  Adding Roman Numeral Literals to Python      Meyer
  S   314  Metadata for Python Software Packages v1.1   Kuchling
  S   315  Enhanced While Loop                          Carroll
- S   318  Decorators for Functions and Methods         Smith, et al
  S   319  Python Synchronize/Asynchronize Block        Pelletier
  S   321  Date/Time Parsing and Formatting             Kuchling
  S   323  Copyable Iterators                           Martelli
@@ -346,7 +346,7 @@
  S   315  Enhanced While Loop                          Carroll
  SD  316  Programming by Contract for Python           Way
  SR  317  Eliminate Implicit Exception Instantiation   Taschuk
- S   318  Decorators for Functions, Methods & Classes  Smith, et al
+ SA  318  Decorators for Functions and Methods         Smith, et al
  S   319  Python Synchronize/Asynchronize Block        Pelletier
  I   320  Python 2.4 Release Schedule                  Warsaw
  S   321  Date/Time Parsing and Formatting             Kuchling