[Python-checkins] python/dist/src/PC config.c, 1.34.2.3, 1.34.2.4 getpathp.c, 1.27.2.2, 1.27.2.3 python_nt.rc, 1.17.2.2, 1.17.2.3 w9xpopen.c, 1.4.2.1, 1.4.2.2

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/PC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27718/PC

Modified Files:
      Tag: ast-branch
	config.c getpathp.c python_nt.rc w9xpopen.c 
Log Message:
Merge head to branch (for the last time)


Index: config.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/config.c,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -u -d -r1.34.2.3 -r1.34.2.4
--- config.c	21 Mar 2005 19:27:37 -0000	1.34.2.3
+++ config.c	16 Oct 2005 05:24:05 -0000	1.34.2.4
@@ -17,7 +17,7 @@
 extern void initimageop(void);
 #endif
 extern void initmath(void);
-extern void initmd5(void);
+extern void init_md5(void);
 extern void initnt(void);
 extern void initoperator(void);
 extern void initregex(void);
@@ -25,7 +25,9 @@
 extern void initrgbimg(void);
 #endif
 extern void initsignal(void);
-extern void initsha(void);
+extern void init_sha(void);
+extern void init_sha256(void);
+extern void init_sha512(void);
 extern void initstrop(void);
 extern void initstruct(void);
 extern void inittime(void);
@@ -53,6 +55,7 @@
 extern void initparser(void);
 extern void init_winreg(void);
 extern void initdatetime(void);
+extern void initfunctional(void);
 
 extern void init_multibytecodec(void);
 extern void init_codecs_cn(void);
@@ -85,7 +88,7 @@
         {"imageop", initimageop},
 #endif
         {"math", initmath},
-        {"md5", initmd5},
+        {"_md5", init_md5},
         {"nt", initnt}, /* Use the NT os functions, not posix */
         {"operator", initoperator},
         {"regex", initregex},
@@ -93,7 +96,9 @@
         {"rgbimg", initrgbimg},
 #endif
         {"signal", initsignal},
-        {"sha", initsha},
+        {"_sha", init_sha},
+        {"_sha256", init_sha256},
+        {"_sha512", init_sha512},
         {"strop", initstrop},
         {"struct", initstruct},
         {"time", inittime},
@@ -123,6 +128,7 @@
 	{"_sre", init_sre},
 	{"_winreg", init_winreg},
 	{"datetime", initdatetime},
+	{"functional", initfunctional},
 
 	{"xxsubtype", initxxsubtype},
 	{"zipimport", initzipimport},

Index: getpathp.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/getpathp.c,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -d -r1.27.2.2 -r1.27.2.3
--- getpathp.c	7 Jan 2005 07:04:12 -0000	1.27.2.2
+++ getpathp.c	16 Oct 2005 05:24:05 -0000	1.27.2.3
@@ -11,7 +11,7 @@
    * Python always adds an empty entry at the start, which corresponds
      to the current directory.
 
-   * If the PYTHONPATH env. var. exists, it's entries are added next.
+   * If the PYTHONPATH env. var. exists, its entries are added next.
 
    * We look in the registry for "application paths" - that is, sub-keys
      under the main PythonPath registry key.  These are added next (the

Index: python_nt.rc
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/python_nt.rc,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -d -r1.17.2.2 -r1.17.2.3
--- python_nt.rc	7 Jan 2005 07:04:12 -0000	1.17.2.2
+++ python_nt.rc	16 Oct 2005 05:24:05 -0000	1.17.2.3
@@ -61,7 +61,7 @@
             VALUE "FileDescription", "Python Core\0"
             VALUE "FileVersion", PYTHON_VERSION
             VALUE "InternalName", "Python DLL\0"
-            VALUE "LegalCopyright", "Copyright © 2001-2004 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
+            VALUE "LegalCopyright", "Copyright © 2001-2005 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
             VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
             VALUE "ProductName", "Python\0"
             VALUE "ProductVersion", PYTHON_VERSION

Index: w9xpopen.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/w9xpopen.c,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- w9xpopen.c	28 Apr 2003 17:17:53 -0000	1.4.2.1
+++ w9xpopen.c	16 Oct 2005 05:24:05 -0000	1.4.2.2
@@ -9,7 +9,7 @@
  * This program is to be launched with redirected standard
  * handles. It will launch the command line specified 16-bit
  * console based application in the same console, forwarding
- * it's own redirected standard handles to the 16-bit child.
+ * its own redirected standard handles to the 16-bit child.
 
  * AKA solution to the problem described in KB: Q150956.
  */