From 56b10379a9e634ce429b5196923ee50099edf2ae Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 23 Apr 2007 01:29:47 +0000
Subject: [PATCH] Various status updates

---
 pep-0361.txt | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pep-0361.txt b/pep-0361.txt
index 4b6f98c62..6973dba5a 100644
--- a/pep-0361.txt
+++ b/pep-0361.txt
@@ -51,16 +51,22 @@ Completed features for 2.6
 
     PEPs:
 
-        None
+        352: Raising a string exception now triggers a TypeError.
+             Attempting to catch a string exception raises DeprecationWarning.
 
     New modules in the standard library:
 
         None
 
-    Other major features:
+    Python 3.0 compatability:
 
         None
 
+    Other major features:
+
+      - with/as will be keywords
+      - a __dir__() special method to control dir() was added [1]
+
 
 Possible features for 2.6
 
@@ -70,7 +76,6 @@ Possible features for 2.6
 
     The following PEPs are being worked on for possible inclusion in 2.6:
 
-        - PEP 275:  Switching on Multiple Values
         - PEP 297:  Support for System Upgrades
 
     Each non-trivial feature listed here that is not a PEP must be 
@@ -78,7 +83,6 @@ Possible features for 2.6
 
         - distutils replacement (requires a PEP)
         - turtle.py replacement or enhancements
-        - adding a __dir__() magic method to control dir() [1]
 
     New modules in the standard library:
 
@@ -86,6 +90,8 @@ Possible features for 2.6
           http://python.org/sf/1505257
           (Owner: MAL)
 
+        - JSON implementation
+
         - setuptools
           BDFL pronouncement for inclusion in 2.5:
           http://mail.python.org/pipermail/python-dev/2006-April/063964.html
@@ -116,16 +122,14 @@ Possible features for 2.6
       * file.xreadlines
       * function attributes that start with func_* (should use __*__)
       * softspace removal for print() function
-      * the L prefix for long literals
-      * removal of the sets module
+      * the L suffix for long literals
+      * removal of the sets and exceptions module
       * renaming of __nonzero__ to __bool__
       * multiple inheritance with classic classes? (MRO might change)
       * properties and classic classes? (instance attrs shadow property)
 
     - use __bool__ method if available and there's no __nonzero__
 
-    - with/as will be keywords
-
     - Check the various bits of code in Demo/ and Tools/ all still work,
       update or remove the ones that don't.
 
@@ -153,7 +157,6 @@ Possible features for 2.6
 
     - Remove the fpectl module?
 
-    - Make everything in Modules/ build cleanly with g++
 
 Deferred until 2.7
 
@@ -177,6 +180,7 @@ References
     [1] Adding a __dir__() magic method
         http://mail.python.org/pipermail/python-dev/2006-July/067139.html
 
+
 Copyright
 
     This document has been placed in the public domain.