Index: PCbuild/pythoncore.vcproj
===================================================================
--- PCbuild/pythoncore.vcproj	(revision 45757)
+++ PCbuild/pythoncore.vcproj	(working copy)
@@ -512,12 +512,9 @@
 			RelativePath="..\Objects\funcobject.c">
 		</file>
 		<file - RelativePath="..\Modules\functionalmodule.c">
+			RelativePath="..\Modules\functoolsmodule.c">
 		</file>
 		<file - RelativePath="..\Modules\functionalmodule.c">
-		</file>
-		
 		<file
Index: setup.py
===================================================================
--- setup.py	(revision 45757)
+++ setup.py	(working copy)
@@ -360,8 +360,8 @@
 exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
 # operator.add() and similar goodies
 exts.append( Extension('operator', ['operator.c']) )
- # functional
- exts.append( Extension("functional", ["functionalmodule.c"]) )
+ # functools
+ exts.append( Extension("functools", ["functoolsmodule.c"]) )
 # Python C API test module
 exts.append( Extension('_testcapi', ['_testcapimodule.c']) )
 # profilers (_lsprof is for cProfile.py)
Index: Misc/NEWS
===================================================================
--- Misc/NEWS	(revision 45757)
+++ Misc/NEWS	(working copy)
@@ -4,6 +4,17 @@
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
+What's New in Python 2.5 alpha 3?
+=================================
+
+*Release date: 27-MAY-2006*
+
+Extension Modules
+-----------------
+
+- The functional module has been renamed to functools. See PEP 309
+
+
 What's New in Python 2.5 alpha 2?
 =================================
 
Index: PC/config.c
===================================================================
--- PC/config.c	(revision 45757)
+++ PC/config.c	(working copy)
@@ -54,7 +54,7 @@
 extern void initparser(void);
 extern void init_winreg(void);
 extern void initdatetime(void);
-extern void initfunctional(void);
+extern void initfunctools(void);
 extern void initzlib(void);
 
 extern void init_multibytecodec(void);
@@ -132,7 +132,7 @@
 	{"parser", initparser},
 	{"_winreg", init_winreg},
 	{"datetime", initdatetime},
-	{"functional", initfunctional},
+	{"functools", initfunctools},
 
 	{"xxsubtype", initxxsubtype},
 	{"zipimport", initzipimport},
Index: Doc/lib/lib.tex
===================================================================
--- Doc/lib/lib.tex	(revision 45757)
+++ Doc/lib/lib.tex	(working copy)
@@ -129,8 +129,8 @@
 % Functions, Functional, Generators and Iterators
 % XXX intro functional
 \input{libitertools}
-\input{libfunctional}
-\input{liboperator} % from runtime - better with itertools and functional
+\input{libfunctools}
+\input{liboperator} % from runtime - better with itertools and functools
 
 
 % =============
 	 	 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file7210/rename_functional.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file7210/rename_functional.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>