From dbb8010eb78b970a657b4007d7658eaca1ca1160 Mon Sep 17 00:00:00 2001
From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 29 May 2006 12:49:03 +0000
Subject: [PATCH] functional has been renamed to functools and alpha 3 was
 skipped

---
 pep-0309.txt | 22 +++++++++++++++++++---
 pep-0356.txt |  9 +++++++--
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pep-0309.txt b/pep-0309.txt
index 8415180bc..c86a6ce75 100644
--- a/pep-0309.txt
+++ b/pep-0309.txt
@@ -8,7 +8,21 @@ Type: Standards Track
 Content-Type: text/x-rst
 Created: 08-Feb-2003
 Python-Version: 2.5
-Post-History: 10-Feb-2003, 27-Feb-2003, 22-Feb-2004
+Post-History: 10-Feb-2003, 27-Feb-2003, 22-Feb-2004, 28-Apr-2006
+
+
+Note
+====
+
+Following the acceptance of this PEP, further discussion on python-dev and
+comp.lang.python revealed a desire for several tools that operated on
+function objects, but were not related to functional programming.  Rather
+than create a new module for these tools, it was agreed [1]_ that the
+"functional" module be renamed to "functools" to reflect its newly-widened
+focus.
+
+References in this PEP to a "functional" module have been left in for
+historical reasons.
 
 
 Abstract
@@ -100,7 +114,7 @@ provided by Scott David Daniels::
             return self.fn(*(self.args + args), **d)
 
 (A recipe similar to this has been in the Python Cookbook for some
-time [1]_.)
+time [3]_.)
 
 Note that when the object is called as though it were a function,
 positional arguments are appended to those provided to the
@@ -269,10 +283,12 @@ implementation has proven itself useful enough to be worth optimising.
 References
 ==========
 
-.. [1] http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52549
+.. [1] http://mail.python.org/pipermail/python-dev/2006-March/062290.html
 
 .. [2] Patches 931005_, 931007_, and 931010_.
 
+.. [3] http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52549
+
 .. _931005: http://www.python.org/sf/931005
 .. _931007: http://www.python.org/sf/931007
 .. _931010: http://www.python.org/sf/931010
diff --git a/pep-0356.txt b/pep-0356.txt
index 933a930c6..ee765d501 100644
--- a/pep-0356.txt
+++ b/pep-0356.txt
@@ -38,7 +38,7 @@ Release Schedule
 
     alpha 1: April 5, 2006 [completed]
     alpha 2: April 27, 2006 [completed]
-    alpha 3: May 25, 2006 [planned]
+    alpha 3: ------------- [skipped]
     beta 1:  June 14, 2006 [planned]
     beta 2:  July 6, 2006 [planned]
     rc 1:    July 27, 2006 [planned]
@@ -106,7 +106,12 @@ Possible features for 2.5
     Each feature below should implemented prior to beta1 or
     will require BDFL approval for inclusion in 2.5.
 
-    - Add @decorator decorator to functional, rename to functools?
+    - Add update_wrapper function to functools (approved by BDFL)
+      http://mail.python.org/pipermail/python-dev/2006-May/064775.html
+      (Owner: Nick Coghlan - patches with tests & docs welcome, though ;)
+
+    - Add @wraps(f) decorator factory to functools?
+      (see comment in functools Python module)
 
     - Modules under consideration for inclusion: