From: Christian Heimes <christian@cheimes.de>
Date: Thu, 4 Dec 2008 14:34:40 +0000 (+0000)
Subject: Bumped up 2.6 to 2.7
X-Git-Tag: v2.7a1~2594
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed2f42377571f95993b4c79c7d1382eeda12acfd;p=thirdparty%2FPython%2Fcpython.git

Bumped up 2.6 to 2.7
---

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index fe20c4edda17..c2ccebb3d50a 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -39,15 +39,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python26.dll"
+				OutputFile="./python27.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python26.pdb"
+				ProgramDatabaseFile=".\./python27.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python26.lib"
+				ImportLibrary=".\./python27.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -99,15 +99,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python26_d.dll"
+				OutputFile="./python27_d.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python26_d.pdb"
+				ProgramDatabaseFile=".\./python27_d.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python26_d.lib"
+				ImportLibrary=".\./python27_d.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -166,15 +166,15 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python26.dll"
+				OutputFile="./python27.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="FALSE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python26.pdb"
+				ProgramDatabaseFile=".\./python27.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python26.lib"
+				ImportLibrary=".\./python27.lib"
 				TargetMachine="0"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -233,15 +233,15 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python26.dll"
+				OutputFile="./python27.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python26.pdb"
+				ProgramDatabaseFile=".\./python27.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python26.lib"
+				ImportLibrary=".\./python27.lib"
 				TargetMachine="0"/>
 			<Tool
 				Name="VCMIDLTool"/>
diff --git a/PC/VS7.1/readme.txt b/PC/VS7.1/readme.txt
index 9b78e6dad093..fdd305021390 100644
--- a/PC/VS7.1/readme.txt
+++ b/PC/VS7.1/readme.txt
@@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects.
 The proper order to build subprojects:
 
 1) pythoncore (this builds the main Python DLL and library files,
-               python26.{dll, lib} in Release mode)
+               python27.{dll, lib} in Release mode)
               NOTE:  in previous releases, this subproject was
               named after the release number, e.g. python20.
 
@@ -26,7 +26,7 @@ The proper order to build subprojects:
    test slave; see SUBPROJECTS below)
 
 When using the Debug setting, the output files have a _d added to
-their name:  python26_d.dll, python_d.exe, parser_d.pyd, and so on.
+their name:  python27_d.dll, python_d.exe, parser_d.pyd, and so on.
 
 SUBPROJECTS
 -----------
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 72b459e3f59d..44f2a24b2452 100644
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -38,7 +38,7 @@
 	/>
 	<UserMacro
 		Name="PyDllName"
-		Value="python26"
+		Value="python27"
 	/>
 	<UserMacro
 		Name="PythonExe"
diff --git a/PC/example_nt/example.vcproj b/PC/example_nt/example.vcproj
index 17714e35b06e..012f63e00712 100644
--- a/PC/example_nt/example.vcproj
+++ b/PC/example_nt/example.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/export:initexample"
-				AdditionalDependencies="odbc32.lib odbccp32.lib python26.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib python27.lib"
 				OutputFile=".\Release/example.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -105,7 +105,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/export:initexample"
-				AdditionalDependencies="odbc32.lib odbccp32.lib python26_d.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib python27_d.lib"
 				OutputFile=".\Debug/example_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index ff04f72cac85..9bfd9271b004 100644
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -237,7 +237,7 @@ $(OUT)%$O: %.c
 
 # Output file names
 PYTHON_VER=	2.6
-PYTHON_LIB=	python26
+PYTHON_LIB=	python27
 PYTHON.LIB=	$(PYTHON_LIB)_s$A
 PYTHON.IMPLIB=	$(PYTHON_LIB)$A
 ifeq ($(EXEOMF),yes)
diff --git a/PC/os2emx/README.os2emx b/PC/os2emx/README.os2emx
index e18679020616..0894a5024aba 100644
--- a/PC/os2emx/README.os2emx
+++ b/PC/os2emx/README.os2emx
@@ -309,7 +309,7 @@ Procedure
    to be installed in a directory other than the PYTHONHOME directory, set 
    the value of the Makefile variable EXE_DIR to the appropriate directory.
 
-3. If you wish the Python core DLL (python26.dll) to be installed in a 
+3. If you wish the Python core DLL (python27.dll) to be installed in a 
    directory other than the directory in which the Python executables are 
    installed (by default, the PYTHONHOME directory), set the value of the 
    Makefile variable DLL_DIR to the appropriate directory.  This DLL must 
diff --git a/PC/os2emx/python26.def b/PC/os2emx/python27.def
similarity index 84%
rename from PC/os2emx/python26.def
rename to PC/os2emx/python27.def
index 279505093218..e41303d02f0e 100644
--- a/PC/os2emx/python26.def
+++ b/PC/os2emx/python27.def
@@ -1,54 +1,54 @@
-LIBRARY python26 INITINSTANCE TERMINSTANCE 
+LIBRARY python27 INITINSTANCE TERMINSTANCE 
 DESCRIPTION "Python 2.6 Core DLL" 
 PROTMODE 
 DATA MULTIPLE NONSHARED 
 EXPORTS 
 
-; From python26_s.lib(config)
+; From python27_s.lib(config)
   "_PyImport_Inittab"
 
-; From python26_s.lib(dlfcn)
+; From python27_s.lib(dlfcn)
 ;  "dlopen"
 ;  "dlsym"
 ;  "dlclose"
 ;  "dlerror"
 
-; From python26_s.lib(getpathp)
+; From python27_s.lib(getpathp)
   "Py_GetProgramFullPath"
   "Py_GetPrefix"
   "Py_GetExecPrefix"
   "Py_GetPath"
 
-; From python26_s.lib(getbuildinfo)
+; From python27_s.lib(getbuildinfo)
   "Py_GetBuildInfo"
   "_Py_svnversion"
 
-; From python26_s.lib(main)
+; From python27_s.lib(main)
   "Py_Main"
   "Py_GetArgcArgv"
 
-; From python26_s.lib(acceler)
+; From python27_s.lib(acceler)
   "PyGrammar_AddAccelerators"
   "PyGrammar_RemoveAccelerators"
 
-; From python26_s.lib(grammar1)
+; From python27_s.lib(grammar1)
   "PyGrammar_FindDFA"
   "PyGrammar_LabelRepr"
 
-; From python26_s.lib(listnode)
+; From python27_s.lib(listnode)
   "PyNode_ListTree"
 
-; From python26_s.lib(node)
+; From python27_s.lib(node)
   "PyNode_New"
   "PyNode_AddChild"
   "PyNode_Free"
 
-; From python26_s.lib(parser)
+; From python27_s.lib(parser)
   "PyParser_AddToken"
   "PyParser_New"
   "PyParser_Delete"
 
-; From python26_s.lib(parsetok)
+; From python27_s.lib(parsetok)
   "Py_TabcheckFlag"
   "PyParser_ParseString"
   "PyParser_ParseStringFlagsFilename"
@@ -56,18 +56,18 @@ EXPORTS
   "PyParser_ParseFileFlags"
   "PyParser_ParseStringFlags"
 
-; From python26_s.lib(bitset)
+; From python27_s.lib(bitset)
   "_Py_newbitset"
   "_Py_delbitset"
   "_Py_addbit"
   "_Py_samebitset"
   "_Py_mergebitset"
 
-; From python26_s.lib(metagrammar)
+; From python27_s.lib(metagrammar)
   "_Py_meta_grammar"
   "Py_meta_grammar"
 
-; From python26_s.lib(tokenizer)
+; From python27_s.lib(tokenizer)
   "PyToken_OneChar"
   "PyToken_TwoChars"
   "PyToken_ThreeChars"
@@ -77,14 +77,14 @@ EXPORTS
   "PyTokenizer_Get"
   "_PyParser_TokenNames"
 
-; From python26_s.lib(myreadline)
+; From python27_s.lib(myreadline)
   "_PyOS_ReadlineTState"
   "PyOS_ReadlineFunctionPointer"
   "PyOS_StdioReadline"
   "PyOS_Readline"
   "PyOS_InputHook"
 
-; From python26_s.lib(abstract)
+; From python27_s.lib(abstract)
   "_PyObject_LengthHint"
   "PyMapping_Size"
   "PyObject_CallMethod"
@@ -175,13 +175,13 @@ EXPORTS
   "PyObject_IsInstance"
   "PyObject_IsSubclass"
 
-; From python26_s.lib(boolobject)
+; From python27_s.lib(boolobject)
   "PyBool_FromLong"
   "PyBool_Type"
   "_Py_ZeroStruct"
   "_Py_TrueStruct"
 
-; From python26_s.lib(bufferobject)
+; From python27_s.lib(bufferobject)
   "PyBuffer_FromObject"
   "PyBuffer_FromReadWriteObject"
   "PyBuffer_FromMemory"
@@ -189,13 +189,13 @@ EXPORTS
   "PyBuffer_New"
   "PyBuffer_Type"
 
-; From python26_s.lib(cellobject)
+; From python27_s.lib(cellobject)
   "PyCell_New"
   "PyCell_Get"
   "PyCell_Set"
   "PyCell_Type"
 
-; From python26_s.lib(classobject)
+; From python27_s.lib(classobject)
   "PyClass_New"
   "PyClass_IsSubclass"
   "PyInstance_New"
@@ -210,7 +210,7 @@ EXPORTS
   "PyInstance_Type"
   "PyMethod_Type"
 
-; From python26_s.lib(cobject)
+; From python27_s.lib(cobject)
   "PyCObject_FromVoidPtr"
   "PyCObject_FromVoidPtrAndDesc"
   "PyCObject_AsVoidPtr"
@@ -219,13 +219,13 @@ EXPORTS
   "PyCObject_SetVoidPtr"
   "PyCObject_Type"
 
-; From python26_s.lib(codeobject)
+; From python27_s.lib(codeobject)
   "PyCode_New"
   "PyCode_Addr2Line"
   "PyCode_CheckLineNumber"
   "PyCode_Type"
 
-; From python26_s.lib(complexobject)
+; From python27_s.lib(complexobject)
   "_Py_c_pow"
   "_Py_c_sum"
   "_Py_c_diff"
@@ -239,7 +239,7 @@ EXPORTS
   "PyComplex_AsCComplex"
   "PyComplex_Type"
 
-; From python26_s.lib(descrobject)
+; From python27_s.lib(descrobject)
   "PyWrapper_New"
   "PyDescr_NewMethod"
   "PyDescr_NewClassMethod"
@@ -250,7 +250,7 @@ EXPORTS
   "PyWrapperDescr_Type"
   "PyProperty_Type"
 
-; From python26_s.lib(dictobject)
+; From python27_s.lib(dictobject)
   "PyDict_New"
   "PyDict_GetItem"
   "PyDict_SetItem"
@@ -274,11 +274,11 @@ EXPORTS
   "PyDictIterValue_Type"
   "PyDictIterItem_Type"
 
-; From python26_s.lib(enumobject)
+; From python27_s.lib(enumobject)
   "PyEnum_Type"
   "PyReversed_Type"
 
-; From python26_s.lib(fileobject)
+; From python27_s.lib(fileobject)
   "PyFile_FromString"
   "Py_UniversalNewlineFread"
   "PyFile_GetLine"
@@ -294,7 +294,7 @@ EXPORTS
   "PyFile_Name"
   "PyFile_Type"
 
-; From python26_s.lib(floatobject)
+; From python27_s.lib(floatobject)
   "PyFloat_FromString"
   "PyFloat_AsDouble"
   "PyFloat_Fini"
@@ -309,7 +309,7 @@ EXPORTS
   "PyFloat_AsStringEx"
   "PyFloat_Type"
 
-; From python26_s.lib(frameobject)
+; From python27_s.lib(frameobject)
   "PyFrame_New"
   "PyFrame_FastToLocals"
   "PyFrame_LocalsToFast"
@@ -319,7 +319,7 @@ EXPORTS
   "PyFrame_BlockPop"
   "PyFrame_Type"
 
-; From python26_s.lib(funcobject)
+; From python27_s.lib(funcobject)
   "PyFunction_New"
   "PyFunction_GetCode"
   "PyFunction_GetGlobals"
@@ -334,12 +334,12 @@ EXPORTS
   "PyClassMethod_Type"
   "PyStaticMethod_Type"
 
-; From python26_s.lib(genobject)
+; From python27_s.lib(genobject)
   "PyGen_New"
   "PyGen_NeedsFinalizing"
   "PyGen_Type"
 
-; From python26_s.lib(intobject)
+; From python27_s.lib(intobject)
   "PyInt_AsLong"
   "PyInt_AsUnsignedLongMask"
   "PyInt_AsUnsignedLongLongMask"
@@ -354,13 +354,13 @@ EXPORTS
   "_PyInt_Init"
   "PyInt_Type"
 
-; From python26_s.lib(iterobject)
+; From python27_s.lib(iterobject)
   "PySeqIter_New"
   "PyCallIter_New"
   "PySeqIter_Type"
   "PyCallIter_Type"
 
-; From python26_s.lib(listobject)
+; From python27_s.lib(listobject)
   "PyList_New"
   "PyList_Append"
   "PyList_Size"
@@ -378,7 +378,7 @@ EXPORTS
   "PyListIter_Type"
   "PyListRevIter_Type"
 
-; From python26_s.lib(longobject)
+; From python27_s.lib(longobject)
   "PyLong_FromDouble"
   "PyLong_AsLong"
   "_PyLong_AsSsize_t"
@@ -408,7 +408,7 @@ EXPORTS
   "PyLong_Type"
   "_PyLong_DigitValue"
 
-; From python26_s.lib(methodobject)
+; From python27_s.lib(methodobject)
   "PyCFunction_Call"
   "Py_FindMethodInChain"
   "PyCFunction_GetFunction"
@@ -420,7 +420,7 @@ EXPORTS
   "PyCFunction_New"
   "PyCFunction_Type"
 
-; From python26_s.lib(moduleobject)
+; From python27_s.lib(moduleobject)
   "PyModule_New"
   "_PyModule_Clear"
   "PyModule_GetDict"
@@ -428,7 +428,7 @@ EXPORTS
   "PyModule_GetFilename"
   "PyModule_Type"
 
-; From python26_s.lib(object)
+; From python27_s.lib(object)
   "Py_DivisionWarningFlag"
   "PyObject_Str"
   "PyObject_Repr"
@@ -481,15 +481,15 @@ EXPORTS
   "_PyTrash_delete_nesting"
   "_PyTrash_delete_later"
 
-; From python26_s.lib(obmalloc)
+; From python27_s.lib(obmalloc)
   "PyObject_Malloc"
   "PyObject_Free"
   "PyObject_Realloc"
 
-; From python26_s.lib(rangeobject)
+; From python27_s.lib(rangeobject)
   "PyRange_Type"
 
-; From python26_s.lib(setobject)
+; From python27_s.lib(setobject)
   "PySet_Pop"
   "PySet_New"
   "PyFrozenSet_New"
@@ -504,7 +504,7 @@ EXPORTS
   "PySet_Type"
   "PyFrozenSet_Type"
 
-; From python26_s.lib(sliceobject)
+; From python27_s.lib(sliceobject)
   "_PySlice_FromIndices"
   "PySlice_GetIndices"
   "PySlice_GetIndicesEx"
@@ -512,7 +512,7 @@ EXPORTS
   "_Py_EllipsisObject"
   "PySlice_Type"
 
-; From python26_s.lib(stringobject)
+; From python27_s.lib(stringobject)
   "PyString_FromStringAndSize"
   "PyString_InternInPlace"
   "PyString_FromString"
@@ -543,12 +543,12 @@ EXPORTS
   "PyString_Type"
   "PyBaseString_Type"
 
-; From python26_s.lib(structseq)
+; From python27_s.lib(structseq)
   "PyStructSequence_InitType"
   "PyStructSequence_New"
   "PyStructSequence_UnnamedField"
 
-; From python26_s.lib(tupleobject)
+; From python27_s.lib(tupleobject)
   "PyTuple_New"
   "PyTuple_Pack"
   "_PyTuple_Resize"
@@ -560,7 +560,7 @@ EXPORTS
   "PyTuple_Type"
   "PyTupleIter_Type"
 
-; From python26_s.lib(typeobject)
+; From python27_s.lib(typeobject)
   "PyType_IsSubtype"
   "_PyType_Lookup"
   "PyType_Ready"
@@ -571,7 +571,7 @@ EXPORTS
   "PyBaseObject_Type"
   "PySuper_Type"
 
-; From python26_s.lib(unicodeobject)
+; From python27_s.lib(unicodeobject)
   "PyUnicodeUCS2_Resize"
   "PyUnicodeUCS2_FromOrdinal"
   "PyUnicodeUCS2_FromObject"
@@ -637,7 +637,7 @@ EXPORTS
   "PyUnicode_AsDecodedObject"
   "PyUnicode_Type"
 
-; From python26_s.lib(unicodectype)
+; From python27_s.lib(unicodectype)
   "_PyUnicode_TypeRecords"
   "_PyUnicodeUCS2_ToNumeric"
   "_PyUnicodeUCS2_IsLowercase"
@@ -655,7 +655,7 @@ EXPORTS
   "_PyUnicodeUCS2_IsNumeric"
   "_PyUnicodeUCS2_IsAlpha"
 
-; From python26_s.lib(weakrefobject)
+; From python27_s.lib(weakrefobject)
   "PyWeakref_NewRef"
   "PyWeakref_NewProxy"
   "PyObject_ClearWeakRefs"
@@ -666,7 +666,7 @@ EXPORTS
   "_PyWeakref_ProxyType"
   "_PyWeakref_CallableProxyType"
 
-; From python26_s.lib(Python-ast)
+; From python27_s.lib(Python-ast)
 ;  "init_ast"
   "Module"
   "Interactive"
@@ -725,18 +725,18 @@ EXPORTS
   "alias"
   "PyAST_mod2obj"
 
-; From python26_s.lib(asdl)
+; From python27_s.lib(asdl)
   "asdl_seq_new"
   "asdl_int_seq_new"
 
-; From python26_s.lib(ast)
+; From python27_s.lib(ast)
   "PyAST_FromNode"
 
-; From python26_s.lib(bltinmodule)
+; From python27_s.lib(bltinmodule)
   "_PyBuiltin_Init"
   "Py_FileSystemDefaultEncoding"
 
-; From python26_s.lib(exceptions)
+; From python27_s.lib(exceptions)
   "PyUnicodeEncodeError_GetStart"
   "PyUnicodeDecodeError_GetStart"
   "PyUnicodeEncodeError_GetEnd"
@@ -812,7 +812,7 @@ EXPORTS
   "PyExc_ImportWarning"
   "PyExc_MemoryErrorInst"
 
-; From python26_s.lib(ceval)
+; From python27_s.lib(ceval)
   "PyEval_EvalFrameEx"
   "PyEval_CallObjectWithKeywords"
   "PyEval_EvalCodeEx"
@@ -851,13 +851,13 @@ EXPORTS
   "_Py_CheckInterval"
   "_Py_Ticker"
 
-; From python26_s.lib(compile)
+; From python27_s.lib(compile)
   "_Py_Mangle"
   "PyAST_Compile"
   "PyNode_Compile"
   "Py_OptimizeFlag"
 
-; From python26_s.lib(codecs)
+; From python27_s.lib(codecs)
   "_PyCodec_Lookup"
   "PyCodec_Encode"
   "PyCodec_Decode"
@@ -876,7 +876,7 @@ EXPORTS
   "PyCodec_LookupError"
   "PyCodec_StrictErrors"
 
-; From python26_s.lib(errors)
+; From python27_s.lib(errors)
   "PyErr_SetNone"
   "PyErr_SetString"
   "PyErr_GivenExceptionMatches"
@@ -902,16 +902,16 @@ EXPORTS
   "PyErr_Warn"
   "PyErr_WarnExplicit"
 
-; From python26_s.lib(frozen)
+; From python27_s.lib(frozen)
   "PyImport_FrozenModules"
 
-; From python26_s.lib(frozenmain)
+; From python27_s.lib(frozenmain)
   "Py_FrozenMain"
 
-; From python26_s.lib(future)
+; From python27_s.lib(future)
   "PyFuture_FromAST"
 
-; From python26_s.lib(getargs)
+; From python27_s.lib(getargs)
   "PyArg_Parse"
   "_PyArg_Parse_SizeT"
   "PyArg_ParseTuple"
@@ -925,25 +925,25 @@ EXPORTS
   "_PyArg_VaParse_SizeT"
   "_PyArg_VaParseTupleAndKeywords_SizeT"
 
-; From python26_s.lib(getcompiler)
+; From python27_s.lib(getcompiler)
   "Py_GetCompiler"
 
-; From python26_s.lib(getcopyright)
+; From python27_s.lib(getcopyright)
   "Py_GetCopyright"
 
-; From python26_s.lib(getmtime)
+; From python27_s.lib(getmtime)
   "PyOS_GetLastModificationTime"
 
-; From python26_s.lib(getplatform)
+; From python27_s.lib(getplatform)
   "Py_GetPlatform"
 
-; From python26_s.lib(getversion)
+; From python27_s.lib(getversion)
   "Py_GetVersion"
 
-; From python26_s.lib(graminit)
+; From python27_s.lib(graminit)
   "_PyParser_Grammar"
 
-; From python26_s.lib(import)
+; From python27_s.lib(import)
   "_PyImport_Init"
   "_PyImportHooks_Init"
   "PyImport_ImportModule"
@@ -970,10 +970,10 @@ EXPORTS
   "PyImport_Inittab"
   "_PyImport_Filetab"
 
-; From python26_s.lib(importdl)
+; From python27_s.lib(importdl)
   "_PyImport_LoadDynamicModule"
 
-; From python26_s.lib(marshal)
+; From python27_s.lib(marshal)
   "PyMarshal_ReadLongFromFile"
   "PyMarshal_WriteObjectToString"
   "PyMarshal_WriteLongToFile"
@@ -984,7 +984,7 @@ EXPORTS
   "PyMarshal_ReadObjectFromString"
   "PyMarshal_Init"
 
-; From python26_s.lib(modsupport)
+; From python27_s.lib(modsupport)
   "Py_InitModule4"
   "Py_BuildValue"
   "_Py_BuildValue_SizeT"
@@ -997,24 +997,24 @@ EXPORTS
   "PyModule_AddStringConstant"
   "_Py_PackageContext"
 
-; From python26_s.lib(mysnprintf)
+; From python27_s.lib(mysnprintf)
   "PyOS_snprintf"
   "PyOS_vsnprintf"
 
-; From python26_s.lib(mystrtoul)
+; From python27_s.lib(mystrtoul)
   "PyOS_strtoul"
   "PyOS_strtol"
 
-; From python26_s.lib(pyarena)
+; From python27_s.lib(pyarena)
   "PyArena_New"
   "PyArena_Free"
   "PyArena_Malloc"
   "PyArena_AddPyObject"
 
-; From python26_s.lib(pyfpe)
+; From python27_s.lib(pyfpe)
   "PyFPE_dummy"
 
-; From python26_s.lib(pystate)
+; From python27_s.lib(pystate)
   "PyInterpreterState_Clear"
   "PyThreadState_Clear"
   "_PyThread_CurrentFrames"
@@ -1039,12 +1039,12 @@ EXPORTS
   "_PyThreadState_Current"
   "_PyThreadState_GetFrame"
 
-; From python26_s.lib(pystrtod)
+; From python27_s.lib(pystrtod)
   "PyOS_ascii_strtod"
   "PyOS_ascii_formatd"
   "PyOS_ascii_atof"
 
-; From python26_s.lib(pythonrun)
+; From python27_s.lib(pythonrun)
   "Py_IgnoreEnvironmentFlag"
   "Py_DebugFlag"
   "Py_VerboseFlag"
@@ -1106,20 +1106,20 @@ EXPORTS
   "Py_UnicodeFlag"
   "_Py_QnewFlag"
 
-; From python26_s.lib(structmember)
+; From python27_s.lib(structmember)
   "PyMember_Get"
   "PyMember_GetOne"
   "PyMember_SetOne"
   "PyMember_Set"
 
-; From python26_s.lib(symtable)
+; From python27_s.lib(symtable)
   "PySymtable_Build"
   "PySymtable_Free"
   "PyST_GetScope"
   "PySymtable_Lookup"
   "PySTEntry_Type"
 
-; From python26_s.lib(sysmodule)
+; From python27_s.lib(sysmodule)
   "_PySys_Init"
   "PySys_WriteStderr"
   "PySys_SetPath"
@@ -1133,22 +1133,22 @@ EXPORTS
   "PySys_ResetWarnOptions"
   "PySys_AddWarnOption"
 
-; From python26_s.lib(traceback)
+; From python27_s.lib(traceback)
   "PyTraceBack_Here"
   "PyTraceBack_Print"
   "PyTraceBack_Type"
 
-; From python26_s.lib(getopt)
+; From python27_s.lib(getopt)
   "_PyOS_GetOpt"
   "_PyOS_opterr"
   "_PyOS_optind"
   "_PyOS_optarg"
 
-; From python26_s.lib(dynload_shlib)
+; From python27_s.lib(dynload_shlib)
   "_PyImport_DynLoadFiletab"
   "_PyImport_GetDynLoadFunc"
 
-; From python26_s.lib(thread)
+; From python27_s.lib(thread)
   "PyThread_delete_key_value"
   "PyThread_init_thread"
   "PyThread_start_new_thread"
@@ -1166,7 +1166,7 @@ EXPORTS
   "PyThread_get_key_value"
   "PyThread__exit_thread"
 
-; From python26_s.lib(gcmodule)
+; From python27_s.lib(gcmodule)
 ;  "initgc"
   "_PyObject_GC_New"
   "_PyObject_GC_NewVar"
@@ -1182,7 +1182,7 @@ EXPORTS
   "_PyObject_GC_Del"
   "_PyGC_generation0"
 
-; From python26_s.lib(signalmodule)
+; From python27_s.lib(signalmodule)
 ;  "initsignal"
   "PyErr_CheckSignals"
   "PyErr_SetInterrupt"
@@ -1191,124 +1191,124 @@ EXPORTS
   "PyOS_InitInterrupts"
   "PyOS_AfterFork"
 
-; From python26_s.lib(posixmodule)
+; From python27_s.lib(posixmodule)
 ;  "initos2"
 
-; From python26_s.lib(threadmodule)
+; From python27_s.lib(threadmodule)
 ;  "initthread"
 
-; From python26_s.lib(arraymodule)
+; From python27_s.lib(arraymodule)
 ;  "initarray"
 ;  "array_methods"
 
-; From python26_s.lib(binascii)
+; From python27_s.lib(binascii)
 ;  "initbinascii"
 
-; From python26_s.lib(cmathmodule)
+; From python27_s.lib(cmathmodule)
 ;  "initcmath"
 
-; From python26_s.lib(_codecsmodule)
+; From python27_s.lib(_codecsmodule)
 ;  "init_codecs"
 
-; From python26_s.lib(collectionsmodule)
+; From python27_s.lib(collectionsmodule)
 ;  "initcollections"
   "dequeiter_type"
   "dequereviter_type"
 
-; From python26_s.lib(cPickle)
+; From python27_s.lib(cPickle)
 ;  "initcPickle"
 ;  "fast_save_leave"
 
-; From python26_s.lib(cStringIO)
+; From python27_s.lib(cStringIO)
 ;  "initcStringIO"
 
-; From python26_s.lib(_csv)
+; From python27_s.lib(_csv)
 ;  "init_csv"
 
-; From python26_s.lib(datetimemodule)
+; From python27_s.lib(datetimemodule)
 ;  "initdatetime"
 
-; From python26_s.lib(dlmodule)
+; From python27_s.lib(dlmodule)
 ;  "initdl"
 
-; From python26_s.lib(errnomodule)
+; From python27_s.lib(errnomodule)
 ;  "initerrno"
 
-; From python26_s.lib(fcntlmodule)
+; From python27_s.lib(fcntlmodule)
 ;  "initfcntl"
 
-; From python26_s.lib(_functoolsmodule)
+; From python27_s.lib(_functoolsmodule)
 ;  "init_functools"
 
-; From python26_s.lib(_heapqmodule)
+; From python27_s.lib(_heapqmodule)
 ;  "init_heapq"
 
-; From python26_s.lib(imageop)
+; From python27_s.lib(imageop)
 ;  "initimageop"
 
-; From python26_s.lib(itertoolsmodule)
+; From python27_s.lib(itertoolsmodule)
 ;  "inititertools"
 
-; From python26_s.lib(_localemodule)
+; From python27_s.lib(_localemodule)
 ;  "init_locale"
 
-; From python26_s.lib(mathmodule)
+; From python27_s.lib(mathmodule)
 ;  "initmath"
 
-; From python26_s.lib(md5)
+; From python27_s.lib(md5)
   "md5_finish"
   "md5_init"
   "md5_append"
 
-; From python26_s.lib(md5module)
+; From python27_s.lib(md5module)
 ;  "init_md5"
 
-; From python26_s.lib(operator)
+; From python27_s.lib(operator)
 ;  "initoperator"
 
-; From python26_s.lib(_randommodule)
+; From python27_s.lib(_randommodule)
 ;  "init_random"
 
-; From python26_s.lib(rgbimgmodule)
+; From python27_s.lib(rgbimgmodule)
 ;  "initrgbimg"
 
-; From python26_s.lib(shamodule)
+; From python27_s.lib(shamodule)
 ;  "init_sha"
 
-; From python26_s.lib(sha256module)
+; From python27_s.lib(sha256module)
 ;  "init_sha256"
 
-; From python26_s.lib(sha512module)
+; From python27_s.lib(sha512module)
 ;  "init_sha512"
 
-; From python26_s.lib(_sre)
+; From python27_s.lib(_sre)
 ;  "init_sre"
 
-; From python26_s.lib(stropmodule)
+; From python27_s.lib(stropmodule)
 ;  "initstrop"
 
-; From python26_s.lib(_struct)
+; From python27_s.lib(_struct)
 ;  "init_struct"
 
-; From python26_s.lib(symtablemodule)
+; From python27_s.lib(symtablemodule)
 ;  "init_symtable"
 
-; From python26_s.lib(termios)
+; From python27_s.lib(termios)
 ;  "inittermios"
 
-; From python26_s.lib(timemodule)
+; From python27_s.lib(timemodule)
 ;  "inittime"
   "_PyTime_DoubleToTimet"
 ;  "inittimezone"
 
-; From python26_s.lib(timingmodule)
+; From python27_s.lib(timingmodule)
 ;  "inittiming"
 
-; From python26_s.lib(_weakref)
+; From python27_s.lib(_weakref)
 ;  "init_weakref"
 
-; From python26_s.lib(xxsubtype)
+; From python27_s.lib(xxsubtype)
 ;  "initxxsubtype"
 
-; From python26_s.lib(zipimport)
+; From python27_s.lib(zipimport)
 ;  "initzipimport"