[Python-checkins] python/nondist/peps pep-0291.txt,1.2,1.3

[goodger@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/peps
In directory sc8-pr-cvs1:/tmp/cvs-serv18208/python/nondist/peps

Modified Files:
	pep-0291.txt 
Log Message:
Clarified the "Features to Avoid" table & text.

Index: pep-0291.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0291.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pep-0291.txt	15 Nov 2002 22:53:27 -0000	1.2
--- pep-0291.txt	30 Nov 2002 01:50:39 -0000	1.3
***************
*** 42,67 ****
      This list is not complete!  It is only meant as a general guide.
  
!     Note the features to avoid were implemented in the following
!     version.  For example, features listed next to 1.5.2 were
!     implemented in 2.0.
  
!         Version    Features
!         -------    --------
            1.5.2    string methods, Unicode, list comprehensions, 
                     augmented assignment (eg, +=), zip(), import x as y,
                     dict.setdefault(), print >> f, calling f(*args, **kw),
!                    plus 2.0 features
  
            2.0      nested scopes, rich comparisons, function attributes,
!                    plus 2.1 features
  
            2.1      use of object or new-style classes, iterators, 
                     using generators, nested scopes, or //
                     without from __future__ import ... statement,
!                    plus 2.2 features
  
            2.2      bool, True, False, basestring, enumerate(), {}.pop(),
!                    PendingDeprecationWarning, Universal Newlines,
!                    plus 2.3 features
  
  
--- 42,66 ----
      This list is not complete!  It is only meant as a general guide.
  
!     Note that the features below were implemented in the version
!     following the one listed.  For example, features listed next to
!     1.5.2 were implemented in 2.0.
  
!         Version    Features to Avoid
!         -------    -----------------
            1.5.2    string methods, Unicode, list comprehensions, 
                     augmented assignment (eg, +=), zip(), import x as y,
                     dict.setdefault(), print >> f, calling f(*args, **kw),
!                    plus all features below
  
            2.0      nested scopes, rich comparisons, function attributes,
!                    plus all features below
  
            2.1      use of object or new-style classes, iterators, 
                     using generators, nested scopes, or //
                     without from __future__ import ... statement,
!                    plus all features below
  
            2.2      bool, True, False, basestring, enumerate(), {}.pop(),
!                    PendingDeprecationWarning, Universal Newlines