Bump version to 3.4.0 alpha 0.

This commit is contained in:
Georg Brandl 2012-09-29 09:34:13 +02:00
parent c7d7136c69
commit 08a9012352
35 changed files with 908 additions and 1005 deletions

View File

@ -122,6 +122,8 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+------------+------------+-----------------+ +----------------+--------------+------------+------------+-----------------+
| 3.3.0 | 3.2 | 2012 | PSF | yes | | 3.3.0 | 3.2 | 2012 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+ +----------------+--------------+------------+------------+-----------------+
| 3.4.0 | 3.3.0 | 2014 | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
.. note:: .. note::

View File

@ -10,13 +10,13 @@ Using the Python Interpreter
Invoking the Interpreter Invoking the Interpreter
======================== ========================
The Python interpreter is usually installed as :file:`/usr/local/bin/python3.3` The Python interpreter is usually installed as :file:`/usr/local/bin/python3.4`
on those machines where it is available; putting :file:`/usr/local/bin` in your on those machines where it is available; putting :file:`/usr/local/bin` in your
Unix shell's search path makes it possible to start it by typing the command: Unix shell's search path makes it possible to start it by typing the command:
.. code-block:: text .. code-block:: text
python3.3 python3.4
to the shell. [#]_ Since the choice of the directory where the interpreter lives to the shell. [#]_ Since the choice of the directory where the interpreter lives
is an installation option, other places are possible; check with your local is an installation option, other places are possible; check with your local
@ -24,11 +24,11 @@ Python guru or system administrator. (E.g., :file:`/usr/local/python` is a
popular alternative location.) popular alternative location.)
On Windows machines, the Python installation is usually placed in On Windows machines, the Python installation is usually placed in
:file:`C:\\Python33`, though you can change this when you're running the :file:`C:\\Python34`, though you can change this when you're running the
installer. To add this directory to your path, you can type the following installer. To add this directory to your path, you can type the following
command into the command prompt in a DOS box:: command into the command prompt in a DOS box::
set path=%path%;C:\python33 set path=%path%;C:\python34
Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on
Windows) at the primary prompt causes the interpreter to exit with a zero exit Windows) at the primary prompt causes the interpreter to exit with a zero exit
@ -95,8 +95,8 @@ with the *secondary prompt*, by default three dots (``...``). The interpreter
prints a welcome message stating its version number and a copyright notice prints a welcome message stating its version number and a copyright notice
before printing the first prompt:: before printing the first prompt::
$ python3.3 $ python3.4
Python 3.3 (default, Sep 24 2012, 09:25:04) Python 3.4 (default, Sep 24 2012, 09:25:04)
[GCC 4.6.3] on linux2 [GCC 4.6.3] on linux2
Type "help", "copyright", "credits" or "license" for more information. Type "help", "copyright", "credits" or "license" for more information.
>>> >>>
@ -149,7 +149,7 @@ Executable Python Scripts
On BSD'ish Unix systems, Python scripts can be made directly executable, like On BSD'ish Unix systems, Python scripts can be made directly executable, like
shell scripts, by putting the line :: shell scripts, by putting the line ::
#! /usr/bin/env python3.3 #! /usr/bin/env python3.4
(assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning (assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning
of the script and giving the file an executable mode. The ``#!`` must be the of the script and giving the file an executable mode. The ``#!`` must be the

View File

@ -15,7 +15,7 @@ operating system::
>>> import os >>> import os
>>> os.getcwd() # Return the current working directory >>> os.getcwd() # Return the current working directory
'C:\\Python33' 'C:\\Python34'
>>> os.chdir('/server/accesslogs') # Change current working directory >>> os.chdir('/server/accesslogs') # Change current working directory
>>> os.system('mkdir today') # Run the command mkdir in the system shell >>> os.system('mkdir today') # Run the command mkdir in the system shell
0 0

View File

@ -275,7 +275,7 @@ applications include caching objects that are expensive to create::
Traceback (most recent call last): Traceback (most recent call last):
File "<stdin>", line 1, in <module> File "<stdin>", line 1, in <module>
d['primary'] # entry was automatically removed d['primary'] # entry was automatically removed
File "C:/python33/lib/weakref.py", line 46, in __getitem__ File "C:/python34/lib/weakref.py", line 46, in __getitem__
o = self.data[key]() o = self.data[key]()
KeyError: 'primary' KeyError: 'primary'

View File

@ -17,13 +17,13 @@
/* Version parsed out into numeric values */ /* Version parsed out into numeric values */
/*--start constants--*/ /*--start constants--*/
#define PY_MAJOR_VERSION 3 #define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 3 #define PY_MINOR_VERSION 4
#define PY_MICRO_VERSION 0 #define PY_MICRO_VERSION 0
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA
#define PY_RELEASE_SERIAL 0 #define PY_RELEASE_SERIAL 0
/* Version as a string */ /* Version as a string */
#define PY_VERSION "3.3.0" #define PY_VERSION "3.4.0a0"
/*--end constants--*/ /*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

View File

@ -75,6 +75,7 @@ the various releases.
3.2.2 3.2.1 2011 PSF yes 3.2.2 3.2.1 2011 PSF yes
3.2.3 3.2.2 2012 PSF yes 3.2.3 3.2.2 2012 PSF yes
3.3.0 3.2 2012 PSF yes 3.3.0 3.2 2012 PSF yes
3.4.0 3.3.0 2014 PSF yes
Footnotes: Footnotes:

View File

@ -13,5 +13,5 @@ used from a setup script as
# Updated automatically by the Python release process. # Updated automatically by the Python release process.
# #
#--start constants-- #--start constants--
__version__ = "3.3.0" __version__ = "3.4.0a0"
#--end constants-- #--end constants--

View File

@ -1 +1 @@
IDLE_VERSION = "3.3.0" IDLE_VERSION = "3.4.0a0"

106
Misc/NEWS
View File

@ -2,120 +2,20 @@
Python News Python News
+++++++++++ +++++++++++
What's New in Python 3.3.1? What's New in Python 3.4.0 Alpha 1?
=========================== ===================================
*Release date: XX-XX-XXXX* *Relase date: XX-XXX-2014*
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
decoder (already working as unicode strings). Patch by Serhiy Storchaka.
- Issue #15144: Fix possible integer overflow when handling pointers as
integer values, by using Py_uintptr_t instead of size_t. Patch by
Serhiy Storchaka.
- Issue #15965: Explicitly cast AT_FDCWD as (int). Required on Solaris 10
(which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
- Issue #15846: Fix SystemError which happened when using ast.parse in an
exception handler on code with syntax errors.
- Issue #15801: Make sure mappings passed to '%' formatting are actually
subscriptable.
Library Library
------- -------
- Issue #15323: improve failure message of Mock.assert_called_once_with
- Issue #16064: unittest -m claims executable is "python", not "python3"
- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
- Issue #15222: Insert blank line after each message in mbox mailboxes
- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
Patch by Serhiy Storchaka.
- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
datetime.MAXYEAR. Patch by Cédric Krier.
- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
elements 'meta' and 'param'.
- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
raise ValueError when the file-like object is closed. Patch by Alessandro
Moura.
- Issue #15876: Fix a refleak in the curses module: window.encoding.
- Issue #15881: Fixed atexit hook in multiprocessing. Original patch
by Chris McDonough.
- Issue #15340: Fix importing the random module when /dev/urandom cannot
be opened. This was a regression caused by the hash randomization patch.
- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
and StringIO objects now raise ValueError when the object has been closed.
Patch by Alessandro Moura.
- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
os.devnull explicitly and leaving it open.
- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
Popen when %action substitutions produce empty strings.
- Issue #12776,#11839: call argparse type function (specified by add_argument)
only once. Before, the type function was called twice in the case where the
default was specified and the argument was given as well. This was
especially problematic for the FileType type, as a default file would always
be opened, even if a file argument was specified on the command line.
- Issue #15906: Fix a regression in argparse caused by the preceding change,
when action='append', type='str' and default=[].
Extension Modules Extension Modules
----------------- -----------------
Tests
-----
- Issue #15304: Fix warning message when os.chdir() fails inside
test.support.temp_cwd(). Patch by Chris Jerdonek.
- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
by Serhiy Storchaka.
- Issue #15557: Added a test suite for the webbrowser module, thanks
to Anton Barkovsky.
Build
-----
- Issue #15819: Make sure we can build Python out-of-tree from a readonly
source directory. (Somewhat related to Issue #9860.)
Documentation
-------------
- Issue #16036: Improve documentation of built-in int()'s signature and
arguments.
- Issue #15935: Clarification of argparse docs, re: add_argument() type and
default arguments. Patch contributed by Chris Jerdonek.
- Issue #11964: Document a change in v3.2 to the behavior of the indent
parameter of json encoding operations.
Tools/Demos
-----------
What's New in Python 3.3.0? What's New in Python 3.3.0?
=========================== ===========================

View File

@ -39,8 +39,8 @@
%define name python %define name python
#--start constants-- #--start constants--
%define version 3.3.0 %define version 3.4.0a0
%define libvers 3.3 %define libvers 3.4
#--end constants-- #--end constants--
%define release 1pydotorg %define release 1pydotorg
%define __prefix /usr %define __prefix /usr

View File

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python33.dll" # ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python34.dll"
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
@ -82,7 +82,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python33_d.dll" /pdbtype:sept # ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python34_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ENDIF !ENDIF

View File

@ -12,7 +12,7 @@ and build the projects.
The proper order to build subprojects: The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files, 1) pythoncore (this builds the main Python DLL and library files,
python33.{dll, lib} in Release mode) python34.{dll, lib} in Release mode)
2) python (this builds the main Python executable, 2) python (this builds the main Python executable,
python.exe in Release mode) python.exe in Release mode)
@ -23,7 +23,7 @@ The proper order to build subprojects:
to the subsystems they implement; see SUBPROJECTS below) to the subsystems they implement; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to When using the Debug setting, the output files have a _d added to
their name: python33_d.dll, python_d.exe, pyexpat_d.pyd, and so on. their name: python34_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
SUBPROJECTS SUBPROJECTS
----------- -----------

View File

@ -39,15 +39,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o" AdditionalDependencies="getbuildinfo.o"
OutputFile="./python33.dll" OutputFile="./python34.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python33.pdb" ProgramDatabaseFile=".\./python34.pdb"
SubSystem="2" SubSystem="2"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
ImportLibrary=".\./python33.lib" ImportLibrary=".\./python34.lib"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -99,15 +99,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o" AdditionalDependencies="getbuildinfo.o"
OutputFile="./python33_d.dll" OutputFile="./python34_d.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python33_d.pdb" ProgramDatabaseFile=".\./python34_d.pdb"
SubSystem="2" SubSystem="2"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
ImportLibrary=".\./python33_d.lib" ImportLibrary=".\./python34_d.lib"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -166,15 +166,15 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o" AdditionalDependencies="getbuildinfo.o"
OutputFile="./python33.dll" OutputFile="./python34.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="FALSE" SuppressStartupBanner="FALSE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python33.pdb" ProgramDatabaseFile=".\./python34.pdb"
SubSystem="2" SubSystem="2"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
ImportLibrary=".\./python33.lib" ImportLibrary=".\./python34.lib"
TargetMachine="0"/> TargetMachine="0"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -233,15 +233,15 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o" AdditionalDependencies="getbuildinfo.o"
OutputFile="./python33.dll" OutputFile="./python34.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python33.pdb" ProgramDatabaseFile=".\./python34.pdb"
SubSystem="2" SubSystem="2"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
ImportLibrary=".\./python33.lib" ImportLibrary=".\./python34.lib"
TargetMachine="0"/> TargetMachine="0"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>

View File

@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects.
The proper order to build subprojects: The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files, 1) pythoncore (this builds the main Python DLL and library files,
python33.{dll, lib} in Release mode) python34.{dll, lib} in Release mode)
NOTE: in previous releases, this subproject was NOTE: in previous releases, this subproject was
named after the release number, e.g. python20. named after the release number, e.g. python20.
@ -26,7 +26,7 @@ The proper order to build subprojects:
test slave; see SUBPROJECTS below) test slave; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to When using the Debug setting, the output files have a _d added to
their name: python33_d.dll, python_d.exe, parser_d.pyd, and so on. their name: python34_d.dll, python_d.exe, parser_d.pyd, and so on.
SUBPROJECTS SUBPROJECTS
----------- -----------

View File

@ -2,10 +2,10 @@
if not defined HOST_PYTHON ( if not defined HOST_PYTHON (
if %1 EQU Debug ( if %1 EQU Debug (
set HOST_PYTHON=python_d.exe set HOST_PYTHON=python_d.exe
if not exist python33_d.dll exit 1 if not exist python34_d.dll exit 1
) ELSE ( ) ELSE (
set HOST_PYTHON=python.exe set HOST_PYTHON=python.exe
if not exist python33.dll exit 1 if not exist python34.dll exit 1
) )
) )
%HOST_PYTHON% build_ssl.py %1 %2 %3 %HOST_PYTHON% build_ssl.py %1 %2 %3

View File

@ -106,7 +106,7 @@ main(int argc, char **argv)
/* /*
* XXX TODO: if we really wanted to be fancy, we could check the * XXX TODO: if we really wanted to be fancy, we could check the
* modules for all processes (not just the python[_d].exe ones) * modules for all processes (not just the python[_d].exe ones)
* and see if any of our DLLs are loaded (i.e. python33[_d].dll), * and see if any of our DLLs are loaded (i.e. python34[_d].dll),
* as that would also inhibit our ability to rebuild the solution. * as that would also inhibit our ability to rebuild the solution.
* Not worth loosing sleep over though; for now, a simple check * Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient. * for just the python executable should be sufficient.

View File

@ -38,7 +38,7 @@
/> />
<UserMacro <UserMacro
Name="PyDllName" Name="PyDllName"
Value="python33" Value="python34"
/> />
<UserMacro <UserMacro
Name="PythonExe" Name="PythonExe"

View File

@ -106,7 +106,7 @@ main(int argc, char **argv)
/* /*
* XXX TODO: if we really wanted to be fancy, we could check the * XXX TODO: if we really wanted to be fancy, we could check the
* modules for all processes (not just the python[_d].exe ones) * modules for all processes (not just the python[_d].exe ones)
* and see if any of our DLLs are loaded (i.e. python33[_d].dll), * and see if any of our DLLs are loaded (i.e. python34[_d].dll),
* as that would also inhibit our ability to rebuild the solution. * as that would also inhibit our ability to rebuild the solution.
* Not worth loosing sleep over though; for now, a simple check * Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient. * for just the python executable should be sufficient.

View File

@ -38,7 +38,7 @@
/> />
<UserMacro <UserMacro
Name="PyDllName" Name="PyDllName"
Value="python33" Value="python34"
/> />
<UserMacro <UserMacro
Name="PythonExe" Name="PythonExe"

View File

@ -39,7 +39,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/export:initexample" AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python33.lib" AdditionalDependencies="odbc32.lib odbccp32.lib python34.lib"
OutputFile=".\Release/example.pyd" OutputFile=".\Release/example.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -105,7 +105,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/export:initexample" AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python33_d.lib" AdditionalDependencies="odbc32.lib odbccp32.lib python34_d.lib"
OutputFile=".\Debug/example_d.pyd" OutputFile=".\Debug/example_d.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"

View File

@ -237,7 +237,7 @@ $(OUT)%$O: %.c
# Output file names # Output file names
PYTHON_VER= 2.6 PYTHON_VER= 2.6
PYTHON_LIB= python33 PYTHON_LIB= python34
PYTHON.LIB= $(PYTHON_LIB)_s$A PYTHON.LIB= $(PYTHON_LIB)_s$A
PYTHON.IMPLIB= $(PYTHON_LIB)$A PYTHON.IMPLIB= $(PYTHON_LIB)$A
ifeq ($(EXEOMF),yes) ifeq ($(EXEOMF),yes)

View File

@ -305,7 +305,7 @@ Procedure
to be installed in a directory other than the PYTHONHOME directory, set to be installed in a directory other than the PYTHONHOME directory, set
the value of the Makefile variable EXE_DIR to the appropriate directory. the value of the Makefile variable EXE_DIR to the appropriate directory.
3. If you wish the Python core DLL (python33.dll) to be installed in a 3. If you wish the Python core DLL (python34.dll) to be installed in a
directory other than the directory in which the Python executables are directory other than the directory in which the Python executables are
installed (by default, the PYTHONHOME directory), set the value of the installed (by default, the PYTHONHOME directory), set the value of the
Makefile variable DLL_DIR to the appropriate directory. This DLL must Makefile variable DLL_DIR to the appropriate directory. This DLL must

View File

@ -1,72 +1,72 @@
LIBRARY python33 INITINSTANCE TERMINSTANCE LIBRARY python34 INITINSTANCE TERMINSTANCE
DESCRIPTION "Python 2.6 Core DLL" DESCRIPTION "Python 2.6 Core DLL"
PROTMODE PROTMODE
DATA MULTIPLE NONSHARED DATA MULTIPLE NONSHARED
EXPORTS EXPORTS
; From python33_s.lib(config) ; From python34_s.lib(config)
"_PyImport_Inittab" "_PyImport_Inittab"
; From python33_s.lib(dlfcn) ; From python34_s.lib(dlfcn)
; "dlopen" ; "dlopen"
; "dlsym" ; "dlsym"
; "dlclose" ; "dlclose"
; "dlerror" ; "dlerror"
; From python33_s.lib(getpathp) ; From python34_s.lib(getpathp)
"Py_GetProgramFullPath" "Py_GetProgramFullPath"
"Py_GetPrefix" "Py_GetPrefix"
"Py_GetExecPrefix" "Py_GetExecPrefix"
"Py_GetPath" "Py_GetPath"
; From python33_s.lib(getbuildinfo) ; From python34_s.lib(getbuildinfo)
"Py_GetBuildInfo" "Py_GetBuildInfo"
"_Py_svnversion" "_Py_svnversion"
; From python33_s.lib(main) ; From python34_s.lib(main)
"Py_Main" "Py_Main"
"Py_GetArgcArgv" "Py_GetArgcArgv"
; From python33_s.lib(acceler) ; From python34_s.lib(acceler)
"PyGrammar_AddAccelerators" "PyGrammar_AddAccelerators"
"PyGrammar_RemoveAccelerators" "PyGrammar_RemoveAccelerators"
; From python33_s.lib(grammar1) ; From python34_s.lib(grammar1)
"PyGrammar_FindDFA" "PyGrammar_FindDFA"
"PyGrammar_LabelRepr" "PyGrammar_LabelRepr"
; From python33_s.lib(listnode) ; From python34_s.lib(listnode)
"PyNode_ListTree" "PyNode_ListTree"
; From python33_s.lib(node) ; From python34_s.lib(node)
"PyNode_New" "PyNode_New"
"PyNode_AddChild" "PyNode_AddChild"
"PyNode_Free" "PyNode_Free"
; From python33_s.lib(parser) ; From python34_s.lib(parser)
"PyParser_AddToken" "PyParser_AddToken"
"PyParser_New" "PyParser_New"
"PyParser_Delete" "PyParser_Delete"
; From python33_s.lib(parsetok) ; From python34_s.lib(parsetok)
"PyParser_ParseString" "PyParser_ParseString"
"PyParser_ParseStringFlagsFilename" "PyParser_ParseStringFlagsFilename"
"PyParser_ParseFile" "PyParser_ParseFile"
"PyParser_ParseFileFlags" "PyParser_ParseFileFlags"
"PyParser_ParseStringFlags" "PyParser_ParseStringFlags"
; From python33_s.lib(bitset) ; From python34_s.lib(bitset)
"_Py_newbitset" "_Py_newbitset"
"_Py_delbitset" "_Py_delbitset"
"_Py_addbit" "_Py_addbit"
"_Py_samebitset" "_Py_samebitset"
"_Py_mergebitset" "_Py_mergebitset"
; From python33_s.lib(metagrammar) ; From python34_s.lib(metagrammar)
"_Py_meta_grammar" "_Py_meta_grammar"
"Py_meta_grammar" "Py_meta_grammar"
; From python33_s.lib(tokenizer) ; From python34_s.lib(tokenizer)
"PyToken_OneChar" "PyToken_OneChar"
"PyToken_TwoChars" "PyToken_TwoChars"
"PyToken_ThreeChars" "PyToken_ThreeChars"
@ -76,14 +76,14 @@ EXPORTS
"PyTokenizer_Get" "PyTokenizer_Get"
"_PyParser_TokenNames" "_PyParser_TokenNames"
; From python33_s.lib(myreadline) ; From python34_s.lib(myreadline)
"_PyOS_ReadlineTState" "_PyOS_ReadlineTState"
"PyOS_ReadlineFunctionPointer" "PyOS_ReadlineFunctionPointer"
"PyOS_StdioReadline" "PyOS_StdioReadline"
"PyOS_Readline" "PyOS_Readline"
"PyOS_InputHook" "PyOS_InputHook"
; From python33_s.lib(abstract) ; From python34_s.lib(abstract)
"_PyObject_LengthHint" "_PyObject_LengthHint"
"PyMapping_Size" "PyMapping_Size"
"PyObject_CallMethod" "PyObject_CallMethod"
@ -174,13 +174,13 @@ EXPORTS
"PyObject_IsInstance" "PyObject_IsInstance"
"PyObject_IsSubclass" "PyObject_IsSubclass"
; From python33_s.lib(boolobject) ; From python34_s.lib(boolobject)
"PyBool_FromLong" "PyBool_FromLong"
"PyBool_Type" "PyBool_Type"
"_Py_ZeroStruct" "_Py_ZeroStruct"
"_Py_TrueStruct" "_Py_TrueStruct"
; From python33_s.lib(bufferobject) ; From python34_s.lib(bufferobject)
"PyBuffer_FromObject" "PyBuffer_FromObject"
"PyBuffer_FromReadWriteObject" "PyBuffer_FromReadWriteObject"
"PyBuffer_FromMemory" "PyBuffer_FromMemory"
@ -188,13 +188,13 @@ EXPORTS
"PyBuffer_New" "PyBuffer_New"
"PyBuffer_Type" "PyBuffer_Type"
; From python33_s.lib(cellobject) ; From python34_s.lib(cellobject)
"PyCell_New" "PyCell_New"
"PyCell_Get" "PyCell_Get"
"PyCell_Set" "PyCell_Set"
"PyCell_Type" "PyCell_Type"
; From python33_s.lib(classobject) ; From python34_s.lib(classobject)
"PyClass_New" "PyClass_New"
"PyClass_IsSubclass" "PyClass_IsSubclass"
"PyInstance_New" "PyInstance_New"
@ -209,7 +209,7 @@ EXPORTS
"PyInstance_Type" "PyInstance_Type"
"PyMethod_Type" "PyMethod_Type"
; From python33_s.lib(capsule) ; From python34_s.lib(capsule)
"PyCapsule_GetContext" "PyCapsule_GetContext"
"PyCapsule_GetDestructor" "PyCapsule_GetDestructor"
"PyCapsule_GetName" "PyCapsule_GetName"
@ -222,7 +222,7 @@ EXPORTS
"PyCapsule_SetName" "PyCapsule_SetName"
"PyCapsule_SetPointer" "PyCapsule_SetPointer"
; From python33_s.lib(cobject) ; From python34_s.lib(cobject)
"PyCObject_FromVoidPtr" "PyCObject_FromVoidPtr"
"PyCObject_FromVoidPtrAndDesc" "PyCObject_FromVoidPtrAndDesc"
"PyCObject_AsVoidPtr" "PyCObject_AsVoidPtr"
@ -231,13 +231,13 @@ EXPORTS
"PyCObject_SetVoidPtr" "PyCObject_SetVoidPtr"
"PyCObject_Type" "PyCObject_Type"
; From python33_s.lib(codeobject) ; From python34_s.lib(codeobject)
"PyCode_New" "PyCode_New"
"PyCode_Addr2Line" "PyCode_Addr2Line"
"PyCode_CheckLineNumber" "PyCode_CheckLineNumber"
"PyCode_Type" "PyCode_Type"
; From python33_s.lib(complexobject) ; From python34_s.lib(complexobject)
"_Py_c_pow" "_Py_c_pow"
"_Py_c_sum" "_Py_c_sum"
"_Py_c_diff" "_Py_c_diff"
@ -251,7 +251,7 @@ EXPORTS
"PyComplex_AsCComplex" "PyComplex_AsCComplex"
"PyComplex_Type" "PyComplex_Type"
; From python33_s.lib(descrobject) ; From python34_s.lib(descrobject)
"PyWrapper_New" "PyWrapper_New"
"PyDescr_NewMethod" "PyDescr_NewMethod"
"PyDescr_NewClassMethod" "PyDescr_NewClassMethod"
@ -262,7 +262,7 @@ EXPORTS
"PyWrapperDescr_Type" "PyWrapperDescr_Type"
"PyProperty_Type" "PyProperty_Type"
; From python33_s.lib(dictobject) ; From python34_s.lib(dictobject)
"PyDict_New" "PyDict_New"
"PyDict_GetItem" "PyDict_GetItem"
"PyDict_SetItem" "PyDict_SetItem"
@ -286,11 +286,11 @@ EXPORTS
"PyDictIterValue_Type" "PyDictIterValue_Type"
"PyDictIterItem_Type" "PyDictIterItem_Type"
; From python33_s.lib(enumobject) ; From python34_s.lib(enumobject)
"PyEnum_Type" "PyEnum_Type"
"PyReversed_Type" "PyReversed_Type"
; From python33_s.lib(fileobject) ; From python34_s.lib(fileobject)
"PyFile_FromString" "PyFile_FromString"
"Py_UniversalNewlineFread" "Py_UniversalNewlineFread"
"PyFile_GetLine" "PyFile_GetLine"
@ -306,7 +306,7 @@ EXPORTS
"PyFile_Name" "PyFile_Name"
"PyFile_Type" "PyFile_Type"
; From python33_s.lib(floatobject) ; From python34_s.lib(floatobject)
"PyFloat_FromString" "PyFloat_FromString"
"PyFloat_AsDouble" "PyFloat_AsDouble"
"PyFloat_Fini" "PyFloat_Fini"
@ -321,7 +321,7 @@ EXPORTS
"PyFloat_AsStringEx" "PyFloat_AsStringEx"
"PyFloat_Type" "PyFloat_Type"
; From python33_s.lib(frameobject) ; From python34_s.lib(frameobject)
"PyFrame_New" "PyFrame_New"
"PyFrame_FastToLocals" "PyFrame_FastToLocals"
"PyFrame_LocalsToFast" "PyFrame_LocalsToFast"
@ -331,7 +331,7 @@ EXPORTS
"PyFrame_BlockPop" "PyFrame_BlockPop"
"PyFrame_Type" "PyFrame_Type"
; From python33_s.lib(funcobject) ; From python34_s.lib(funcobject)
"PyFunction_New" "PyFunction_New"
"PyFunction_GetCode" "PyFunction_GetCode"
"PyFunction_GetGlobals" "PyFunction_GetGlobals"
@ -346,12 +346,12 @@ EXPORTS
"PyClassMethod_Type" "PyClassMethod_Type"
"PyStaticMethod_Type" "PyStaticMethod_Type"
; From python33_s.lib(genobject) ; From python34_s.lib(genobject)
"PyGen_New" "PyGen_New"
"PyGen_NeedsFinalizing" "PyGen_NeedsFinalizing"
"PyGen_Type" "PyGen_Type"
; From python33_s.lib(intobject) ; From python34_s.lib(intobject)
"PyInt_AsLong" "PyInt_AsLong"
"PyInt_AsUnsignedLongMask" "PyInt_AsUnsignedLongMask"
"PyInt_AsUnsignedLongLongMask" "PyInt_AsUnsignedLongLongMask"
@ -366,13 +366,13 @@ EXPORTS
"_PyInt_Init" "_PyInt_Init"
"PyInt_Type" "PyInt_Type"
; From python33_s.lib(iterobject) ; From python34_s.lib(iterobject)
"PySeqIter_New" "PySeqIter_New"
"PyCallIter_New" "PyCallIter_New"
"PySeqIter_Type" "PySeqIter_Type"
"PyCallIter_Type" "PyCallIter_Type"
; From python33_s.lib(listobject) ; From python34_s.lib(listobject)
"PyList_New" "PyList_New"
"PyList_Append" "PyList_Append"
"PyList_Size" "PyList_Size"
@ -390,7 +390,7 @@ EXPORTS
"PyListIter_Type" "PyListIter_Type"
"PyListRevIter_Type" "PyListRevIter_Type"
; From python33_s.lib(longobject) ; From python34_s.lib(longobject)
"PyLong_FromDouble" "PyLong_FromDouble"
"PyLong_AsLong" "PyLong_AsLong"
"_PyLong_AsSsize_t" "_PyLong_AsSsize_t"
@ -420,7 +420,7 @@ EXPORTS
"PyLong_Type" "PyLong_Type"
"_PyLong_DigitValue" "_PyLong_DigitValue"
; From python33_s.lib(methodobject) ; From python34_s.lib(methodobject)
"PyCFunction_Call" "PyCFunction_Call"
"Py_FindMethodInChain" "Py_FindMethodInChain"
"PyCFunction_GetFunction" "PyCFunction_GetFunction"
@ -432,7 +432,7 @@ EXPORTS
"PyCFunction_New" "PyCFunction_New"
"PyCFunction_Type" "PyCFunction_Type"
; From python33_s.lib(moduleobject) ; From python34_s.lib(moduleobject)
"PyModule_New" "PyModule_New"
"_PyModule_Clear" "_PyModule_Clear"
"PyModule_GetDict" "PyModule_GetDict"
@ -440,7 +440,7 @@ EXPORTS
"PyModule_GetFilename" "PyModule_GetFilename"
"PyModule_Type" "PyModule_Type"
; From python33_s.lib(object) ; From python34_s.lib(object)
"Py_DivisionWarningFlag" "Py_DivisionWarningFlag"
"PyObject_Str" "PyObject_Str"
"PyObject_Repr" "PyObject_Repr"
@ -493,15 +493,15 @@ EXPORTS
"_PyTrash_delete_nesting" "_PyTrash_delete_nesting"
"_PyTrash_delete_later" "_PyTrash_delete_later"
; From python33_s.lib(obmalloc) ; From python34_s.lib(obmalloc)
"PyObject_Malloc" "PyObject_Malloc"
"PyObject_Free" "PyObject_Free"
"PyObject_Realloc" "PyObject_Realloc"
; From python33_s.lib(rangeobject) ; From python34_s.lib(rangeobject)
"PyRange_Type" "PyRange_Type"
; From python33_s.lib(setobject) ; From python34_s.lib(setobject)
"PySet_Pop" "PySet_Pop"
"PySet_New" "PySet_New"
"PyFrozenSet_New" "PyFrozenSet_New"
@ -516,7 +516,7 @@ EXPORTS
"PySet_Type" "PySet_Type"
"PyFrozenSet_Type" "PyFrozenSet_Type"
; From python33_s.lib(sliceobject) ; From python34_s.lib(sliceobject)
"_PySlice_FromIndices" "_PySlice_FromIndices"
"PySlice_GetIndices" "PySlice_GetIndices"
"PySlice_GetIndicesEx" "PySlice_GetIndicesEx"
@ -524,7 +524,7 @@ EXPORTS
"_Py_EllipsisObject" "_Py_EllipsisObject"
"PySlice_Type" "PySlice_Type"
; From python33_s.lib(stringobject) ; From python34_s.lib(stringobject)
"PyString_FromStringAndSize" "PyString_FromStringAndSize"
"PyString_InternInPlace" "PyString_InternInPlace"
"PyString_FromString" "PyString_FromString"
@ -555,12 +555,12 @@ EXPORTS
"PyString_Type" "PyString_Type"
"PyBaseString_Type" "PyBaseString_Type"
; From python33_s.lib(structseq) ; From python34_s.lib(structseq)
"PyStructSequence_InitType" "PyStructSequence_InitType"
"PyStructSequence_New" "PyStructSequence_New"
"PyStructSequence_UnnamedField" "PyStructSequence_UnnamedField"
; From python33_s.lib(tupleobject) ; From python34_s.lib(tupleobject)
"PyTuple_New" "PyTuple_New"
"PyTuple_Pack" "PyTuple_Pack"
"_PyTuple_Resize" "_PyTuple_Resize"
@ -572,7 +572,7 @@ EXPORTS
"PyTuple_Type" "PyTuple_Type"
"PyTupleIter_Type" "PyTupleIter_Type"
; From python33_s.lib(typeobject) ; From python34_s.lib(typeobject)
"PyType_IsSubtype" "PyType_IsSubtype"
"_PyType_Lookup" "_PyType_Lookup"
"PyType_Ready" "PyType_Ready"
@ -583,7 +583,7 @@ EXPORTS
"PyBaseObject_Type" "PyBaseObject_Type"
"PySuper_Type" "PySuper_Type"
; From python33_s.lib(unicodeobject) ; From python34_s.lib(unicodeobject)
"PyUnicodeUCS2_Resize" "PyUnicodeUCS2_Resize"
"PyUnicodeUCS2_FromOrdinal" "PyUnicodeUCS2_FromOrdinal"
"PyUnicodeUCS2_FromObject" "PyUnicodeUCS2_FromObject"
@ -649,7 +649,7 @@ EXPORTS
"PyUnicode_AsDecodedObject" "PyUnicode_AsDecodedObject"
"PyUnicode_Type" "PyUnicode_Type"
; From python33_s.lib(unicodectype) ; From python34_s.lib(unicodectype)
"_PyUnicode_TypeRecords" "_PyUnicode_TypeRecords"
"_PyUnicodeUCS2_ToNumeric" "_PyUnicodeUCS2_ToNumeric"
"_PyUnicodeUCS2_IsLowercase" "_PyUnicodeUCS2_IsLowercase"
@ -667,7 +667,7 @@ EXPORTS
"_PyUnicodeUCS2_IsNumeric" "_PyUnicodeUCS2_IsNumeric"
"_PyUnicodeUCS2_IsAlpha" "_PyUnicodeUCS2_IsAlpha"
; From python33_s.lib(weakrefobject) ; From python34_s.lib(weakrefobject)
"PyWeakref_NewRef" "PyWeakref_NewRef"
"PyWeakref_NewProxy" "PyWeakref_NewProxy"
"PyObject_ClearWeakRefs" "PyObject_ClearWeakRefs"
@ -678,7 +678,7 @@ EXPORTS
"_PyWeakref_ProxyType" "_PyWeakref_ProxyType"
"_PyWeakref_CallableProxyType" "_PyWeakref_CallableProxyType"
; From python33_s.lib(Python-ast) ; From python34_s.lib(Python-ast)
; "init_ast" ; "init_ast"
"Module" "Module"
"Interactive" "Interactive"
@ -737,18 +737,18 @@ EXPORTS
"alias" "alias"
"PyAST_mod2obj" "PyAST_mod2obj"
; From python33_s.lib(asdl) ; From python34_s.lib(asdl)
"asdl_seq_new" "asdl_seq_new"
"asdl_int_seq_new" "asdl_int_seq_new"
; From python33_s.lib(ast) ; From python34_s.lib(ast)
"PyAST_FromNode" "PyAST_FromNode"
; From python33_s.lib(bltinmodule) ; From python34_s.lib(bltinmodule)
"_PyBuiltin_Init" "_PyBuiltin_Init"
"Py_FileSystemDefaultEncoding" "Py_FileSystemDefaultEncoding"
; From python33_s.lib(exceptions) ; From python34_s.lib(exceptions)
"PyUnicodeEncodeError_GetStart" "PyUnicodeEncodeError_GetStart"
"PyUnicodeDecodeError_GetStart" "PyUnicodeDecodeError_GetStart"
"PyUnicodeEncodeError_GetEnd" "PyUnicodeEncodeError_GetEnd"
@ -824,7 +824,7 @@ EXPORTS
"PyExc_ImportWarning" "PyExc_ImportWarning"
"PyExc_MemoryErrorInst" "PyExc_MemoryErrorInst"
; From python33_s.lib(ceval) ; From python34_s.lib(ceval)
"PyEval_EvalFrameEx" "PyEval_EvalFrameEx"
"PyEval_CallObjectWithKeywords" "PyEval_CallObjectWithKeywords"
"PyEval_EvalCodeEx" "PyEval_EvalCodeEx"
@ -863,13 +863,13 @@ EXPORTS
"_Py_CheckInterval" "_Py_CheckInterval"
"_Py_Ticker" "_Py_Ticker"
; From python33_s.lib(compile) ; From python34_s.lib(compile)
"_Py_Mangle" "_Py_Mangle"
"PyAST_Compile" "PyAST_Compile"
"PyNode_Compile" "PyNode_Compile"
"Py_OptimizeFlag" "Py_OptimizeFlag"
; From python33_s.lib(codecs) ; From python34_s.lib(codecs)
"_PyCodec_Lookup" "_PyCodec_Lookup"
"PyCodec_Encode" "PyCodec_Encode"
"PyCodec_Decode" "PyCodec_Decode"
@ -888,7 +888,7 @@ EXPORTS
"PyCodec_LookupError" "PyCodec_LookupError"
"PyCodec_StrictErrors" "PyCodec_StrictErrors"
; From python33_s.lib(errors) ; From python34_s.lib(errors)
"PyErr_SetNone" "PyErr_SetNone"
"PyErr_SetString" "PyErr_SetString"
"PyErr_GivenExceptionMatches" "PyErr_GivenExceptionMatches"
@ -914,16 +914,16 @@ EXPORTS
"PyErr_Warn" "PyErr_Warn"
"PyErr_WarnExplicit" "PyErr_WarnExplicit"
; From python33_s.lib(frozen) ; From python34_s.lib(frozen)
"PyImport_FrozenModules" "PyImport_FrozenModules"
; From python33_s.lib(frozenmain) ; From python34_s.lib(frozenmain)
"Py_FrozenMain" "Py_FrozenMain"
; From python33_s.lib(future) ; From python34_s.lib(future)
"PyFuture_FromAST" "PyFuture_FromAST"
; From python33_s.lib(getargs) ; From python34_s.lib(getargs)
"PyArg_Parse" "PyArg_Parse"
"_PyArg_Parse_SizeT" "_PyArg_Parse_SizeT"
"PyArg_ParseTuple" "PyArg_ParseTuple"
@ -937,22 +937,22 @@ EXPORTS
"_PyArg_VaParse_SizeT" "_PyArg_VaParse_SizeT"
"_PyArg_VaParseTupleAndKeywords_SizeT" "_PyArg_VaParseTupleAndKeywords_SizeT"
; From python33_s.lib(getcompiler) ; From python34_s.lib(getcompiler)
"Py_GetCompiler" "Py_GetCompiler"
; From python33_s.lib(getcopyright) ; From python34_s.lib(getcopyright)
"Py_GetCopyright" "Py_GetCopyright"
; From python33_s.lib(getplatform) ; From python34_s.lib(getplatform)
"Py_GetPlatform" "Py_GetPlatform"
; From python33_s.lib(getversion) ; From python34_s.lib(getversion)
"Py_GetVersion" "Py_GetVersion"
; From python33_s.lib(graminit) ; From python34_s.lib(graminit)
"_PyParser_Grammar" "_PyParser_Grammar"
; From python33_s.lib(import) ; From python34_s.lib(import)
"_PyImport_Init" "_PyImport_Init"
"_PyImportHooks_Init" "_PyImportHooks_Init"
"PyImport_ImportModule" "PyImport_ImportModule"
@ -979,10 +979,10 @@ EXPORTS
"PyImport_Inittab" "PyImport_Inittab"
"_PyImport_Filetab" "_PyImport_Filetab"
; From python33_s.lib(importdl) ; From python34_s.lib(importdl)
"_PyImport_LoadDynamicModule" "_PyImport_LoadDynamicModule"
; From python33_s.lib(marshal) ; From python34_s.lib(marshal)
"PyMarshal_ReadLongFromFile" "PyMarshal_ReadLongFromFile"
"PyMarshal_WriteObjectToString" "PyMarshal_WriteObjectToString"
"PyMarshal_WriteLongToFile" "PyMarshal_WriteLongToFile"
@ -993,7 +993,7 @@ EXPORTS
"PyMarshal_ReadObjectFromString" "PyMarshal_ReadObjectFromString"
"PyMarshal_Init" "PyMarshal_Init"
; From python33_s.lib(modsupport) ; From python34_s.lib(modsupport)
"Py_InitModule4" "Py_InitModule4"
"Py_BuildValue" "Py_BuildValue"
"_Py_BuildValue_SizeT" "_Py_BuildValue_SizeT"
@ -1006,24 +1006,24 @@ EXPORTS
"PyModule_AddStringConstant" "PyModule_AddStringConstant"
"_Py_PackageContext" "_Py_PackageContext"
; From python33_s.lib(mysnprintf) ; From python34_s.lib(mysnprintf)
"PyOS_snprintf" "PyOS_snprintf"
"PyOS_vsnprintf" "PyOS_vsnprintf"
; From python33_s.lib(mystrtoul) ; From python34_s.lib(mystrtoul)
"PyOS_strtoul" "PyOS_strtoul"
"PyOS_strtol" "PyOS_strtol"
; From python33_s.lib(pyarena) ; From python34_s.lib(pyarena)
"PyArena_New" "PyArena_New"
"PyArena_Free" "PyArena_Free"
"PyArena_Malloc" "PyArena_Malloc"
"PyArena_AddPyObject" "PyArena_AddPyObject"
; From python33_s.lib(pyfpe) ; From python34_s.lib(pyfpe)
"PyFPE_dummy" "PyFPE_dummy"
; From python33_s.lib(pystate) ; From python34_s.lib(pystate)
"PyInterpreterState_Clear" "PyInterpreterState_Clear"
"PyThreadState_Clear" "PyThreadState_Clear"
"_PyThread_CurrentFrames" "_PyThread_CurrentFrames"
@ -1048,7 +1048,7 @@ EXPORTS
"_PyThreadState_Current" "_PyThreadState_Current"
"_PyThreadState_GetFrame" "_PyThreadState_GetFrame"
; From python33_s.lib(pythonrun) ; From python34_s.lib(pythonrun)
"Py_IgnoreEnvironmentFlag" "Py_IgnoreEnvironmentFlag"
"Py_DebugFlag" "Py_DebugFlag"
"Py_VerboseFlag" "Py_VerboseFlag"
@ -1110,20 +1110,20 @@ EXPORTS
"Py_UnicodeFlag" "Py_UnicodeFlag"
"_Py_QnewFlag" "_Py_QnewFlag"
; From python33_s.lib(structmember) ; From python34_s.lib(structmember)
"PyMember_Get" "PyMember_Get"
"PyMember_GetOne" "PyMember_GetOne"
"PyMember_SetOne" "PyMember_SetOne"
"PyMember_Set" "PyMember_Set"
; From python33_s.lib(symtable) ; From python34_s.lib(symtable)
"PySymtable_Build" "PySymtable_Build"
"PySymtable_Free" "PySymtable_Free"
"PyST_GetScope" "PyST_GetScope"
"PySymtable_Lookup" "PySymtable_Lookup"
"PySTEntry_Type" "PySTEntry_Type"
; From python33_s.lib(sysmodule) ; From python34_s.lib(sysmodule)
"_PySys_Init" "_PySys_Init"
"PySys_WriteStderr" "PySys_WriteStderr"
"PySys_SetPath" "PySys_SetPath"
@ -1137,22 +1137,22 @@ EXPORTS
"PySys_ResetWarnOptions" "PySys_ResetWarnOptions"
"PySys_AddWarnOption" "PySys_AddWarnOption"
; From python33_s.lib(traceback) ; From python34_s.lib(traceback)
"PyTraceBack_Here" "PyTraceBack_Here"
"PyTraceBack_Print" "PyTraceBack_Print"
"PyTraceBack_Type" "PyTraceBack_Type"
; From python33_s.lib(getopt) ; From python34_s.lib(getopt)
"_PyOS_GetOpt" "_PyOS_GetOpt"
"_PyOS_opterr" "_PyOS_opterr"
"_PyOS_optind" "_PyOS_optind"
"_PyOS_optarg" "_PyOS_optarg"
; From python33_s.lib(dynload_shlib) ; From python34_s.lib(dynload_shlib)
"_PyImport_DynLoadFiletab" "_PyImport_DynLoadFiletab"
"_PyImport_GetDynLoadFunc" "_PyImport_GetDynLoadFunc"
; From python33_s.lib(thread) ; From python34_s.lib(thread)
"PyThread_delete_key_value" "PyThread_delete_key_value"
"PyThread_init_thread" "PyThread_init_thread"
"PyThread_start_new_thread" "PyThread_start_new_thread"
@ -1169,7 +1169,7 @@ EXPORTS
"PyThread_set_key_value" "PyThread_set_key_value"
"PyThread_get_key_value" "PyThread_get_key_value"
; From python33_s.lib(gcmodule) ; From python34_s.lib(gcmodule)
; "initgc" ; "initgc"
"_PyObject_GC_New" "_PyObject_GC_New"
"_PyObject_GC_NewVar" "_PyObject_GC_NewVar"
@ -1185,7 +1185,7 @@ EXPORTS
"_PyObject_GC_Del" "_PyObject_GC_Del"
"_PyGC_generation0" "_PyGC_generation0"
; From python33_s.lib(signalmodule) ; From python34_s.lib(signalmodule)
; "initsignal" ; "initsignal"
"PyErr_CheckSignals" "PyErr_CheckSignals"
"PyErr_SetInterrupt" "PyErr_SetInterrupt"
@ -1194,121 +1194,121 @@ EXPORTS
"PyOS_InitInterrupts" "PyOS_InitInterrupts"
"PyOS_AfterFork" "PyOS_AfterFork"
; From python33_s.lib(posixmodule) ; From python34_s.lib(posixmodule)
; "initos2" ; "initos2"
; From python33_s.lib(_threadmodule) ; From python34_s.lib(_threadmodule)
; "init_thread" ; "init_thread"
; From python33_s.lib(arraymodule) ; From python34_s.lib(arraymodule)
; "initarray" ; "initarray"
; "array_methods" ; "array_methods"
; From python33_s.lib(binascii) ; From python34_s.lib(binascii)
; "initbinascii" ; "initbinascii"
; From python33_s.lib(cmathmodule) ; From python34_s.lib(cmathmodule)
; "initcmath" ; "initcmath"
; From python33_s.lib(_codecsmodule) ; From python34_s.lib(_codecsmodule)
; "init_codecs" ; "init_codecs"
; From python33_s.lib(collectionsmodule) ; From python34_s.lib(collectionsmodule)
; "initcollections" ; "initcollections"
"dequeiter_type" "dequeiter_type"
"dequereviter_type" "dequereviter_type"
; From python33_s.lib(cPickle) ; From python34_s.lib(cPickle)
; "initcPickle" ; "initcPickle"
; "fast_save_leave" ; "fast_save_leave"
; From python33_s.lib(_csv) ; From python34_s.lib(_csv)
; "init_csv" ; "init_csv"
; From python33_s.lib(datetimemodule) ; From python34_s.lib(datetimemodule)
; "initdatetime" ; "initdatetime"
; From python33_s.lib(dlmodule) ; From python34_s.lib(dlmodule)
; "initdl" ; "initdl"
; From python33_s.lib(errnomodule) ; From python34_s.lib(errnomodule)
; "initerrno" ; "initerrno"
; From python33_s.lib(fcntlmodule) ; From python34_s.lib(fcntlmodule)
; "initfcntl" ; "initfcntl"
; From python33_s.lib(_functoolsmodule) ; From python34_s.lib(_functoolsmodule)
; "init_functools" ; "init_functools"
; From python33_s.lib(_heapqmodule) ; From python34_s.lib(_heapqmodule)
; "init_heapq" ; "init_heapq"
; From python33_s.lib(imageop) ; From python34_s.lib(imageop)
; "initimageop" ; "initimageop"
; From python33_s.lib(itertoolsmodule) ; From python34_s.lib(itertoolsmodule)
; "inititertools" ; "inititertools"
; From python33_s.lib(_localemodule) ; From python34_s.lib(_localemodule)
; "init_locale" ; "init_locale"
; From python33_s.lib(mathmodule) ; From python34_s.lib(mathmodule)
; "initmath" ; "initmath"
; From python33_s.lib(md5) ; From python34_s.lib(md5)
"md5_finish" "md5_finish"
"md5_init" "md5_init"
"md5_append" "md5_append"
; From python33_s.lib(md5module) ; From python34_s.lib(md5module)
; "init_md5" ; "init_md5"
; From python33_s.lib(operator) ; From python34_s.lib(operator)
; "initoperator" ; "initoperator"
; From python33_s.lib(_randommodule) ; From python34_s.lib(_randommodule)
; "init_random" ; "init_random"
; From python33_s.lib(rgbimgmodule) ; From python34_s.lib(rgbimgmodule)
; "initrgbimg" ; "initrgbimg"
; From python33_s.lib(shamodule) ; From python34_s.lib(shamodule)
; "init_sha" ; "init_sha"
; From python33_s.lib(sha256module) ; From python34_s.lib(sha256module)
; "init_sha256" ; "init_sha256"
; From python33_s.lib(sha512module) ; From python34_s.lib(sha512module)
; "init_sha512" ; "init_sha512"
; From python33_s.lib(_sre) ; From python34_s.lib(_sre)
; "init_sre" ; "init_sre"
; From python33_s.lib(stropmodule) ; From python34_s.lib(stropmodule)
; "initstrop" ; "initstrop"
; From python33_s.lib(_struct) ; From python34_s.lib(_struct)
; "init_struct" ; "init_struct"
; From python33_s.lib(symtablemodule) ; From python34_s.lib(symtablemodule)
; "init_symtable" ; "init_symtable"
; From python33_s.lib(termios) ; From python34_s.lib(termios)
; "inittermios" ; "inittermios"
; From python33_s.lib(timemodule) ; From python34_s.lib(timemodule)
; "inittime" ; "inittime"
"_PyTime_DoubleToTimet" "_PyTime_DoubleToTimet"
; "inittimezone" ; "inittimezone"
; From python33_s.lib(timingmodule) ; From python34_s.lib(timingmodule)
; "inittiming" ; "inittiming"
; From python33_s.lib(_weakref) ; From python34_s.lib(_weakref)
; "init_weakref" ; "init_weakref"
; From python33_s.lib(xxsubtype) ; From python34_s.lib(xxsubtype)
; "initxxsubtype" ; "initxxsubtype"
; From python33_s.lib(zipimport) ; From python34_s.lib(zipimport)
; "initzipimport" ; "initzipimport"

View File

@ -324,11 +324,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
their Makefile (other compilers are generally their Makefile (other compilers are generally
taken care of by distutils.) */ taken care of by distutils.) */
# if defined(_DEBUG) # if defined(_DEBUG)
# pragma comment(lib,"python33_d.lib") # pragma comment(lib,"python34_d.lib")
# elif defined(Py_LIMITED_API) # elif defined(Py_LIMITED_API)
# pragma comment(lib,"python3.lib") # pragma comment(lib,"python3.lib")
# else # else
# pragma comment(lib,"python33.lib") # pragma comment(lib,"python34.lib")
# endif /* _DEBUG */ # endif /* _DEBUG */
# endif /* _MSC_VER */ # endif /* _MSC_VER */
# endif /* Py_BUILD_CORE */ # endif /* Py_BUILD_CORE */

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,10 @@
$(OutDir)python3.dll: python3.def $(OutDir)python33stub.lib $(OutDir)python3.dll: python3.def $(OutDir)python34stub.lib
cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python33stub.lib cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python34stub.lib
$(OutDir)python33stub.lib: python33stub.def $(OutDir)python34stub.lib: python34stub.def
lib /def:python33stub.def /out:$(OutDir)python33stub.lib /MACHINE:$(MACHINE) lib /def:python34stub.def /out:$(OutDir)python34stub.lib /MACHINE:$(MACHINE)
clean: clean:
del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python33stub.lib $(OutDir)python3.exp $(OutDir)python33stub.exp del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python34stub.lib $(OutDir)python3.exp $(OutDir)python34stub.exp
rebuild: clean $(OutDir)python3.dll rebuild: clean $(OutDir)python3.dll

View File

@ -1,9 +1,9 @@
# Generate python33stub.def out of python3.def # Generate python34stub.def out of python3.def
# The regular import library cannot be used, # The regular import library cannot be used,
# since it doesn't provide the right symbols for # since it doesn't provide the right symbols for
# data forwarding # data forwarding
out = open("python33stub.def", "w") out = open("python34stub.def", "w")
out.write('LIBRARY "python33"\n') out.write('LIBRARY "python34"\n')
out.write('EXPORTS\n') out.write('EXPORTS\n')
inp = open("python3.def") inp = open("python3.def")
@ -14,7 +14,7 @@ line = inp.readline() # LIBRARY
assert line.strip()=='EXPORTS' assert line.strip()=='EXPORTS'
for line in inp: for line in inp:
# SYM1=python33.SYM2[ DATA] # SYM1=python34.SYM2[ DATA]
head, tail = line.split('.') head, tail = line.split('.')
if 'DATA' in tail: if 'DATA' in tail:
symbol, tail = tail.split(' ') symbol, tail = tail.split(' ')

View File

@ -1,4 +1,4 @@
LIBRARY "python33" LIBRARY "python34"
EXPORTS EXPORTS
PyArg_Parse PyArg_Parse
PyArg_ParseTuple PyArg_ParseTuple

View File

@ -2,10 +2,10 @@
if not defined HOST_PYTHON ( if not defined HOST_PYTHON (
if %1 EQU Debug ( if %1 EQU Debug (
set HOST_PYTHON=python_d.exe set HOST_PYTHON=python_d.exe
if not exist python33_d.dll exit 1 if not exist python34_d.dll exit 1
) ELSE ( ) ELSE (
set HOST_PYTHON=python.exe set HOST_PYTHON=python.exe
if not exist python33.dll exit 1 if not exist python34.dll exit 1
) )
) )
%HOST_PYTHON% build_ssl.py %1 %2 %3 %HOST_PYTHON% build_ssl.py %1 %2 %3

View File

@ -106,7 +106,7 @@ main(int argc, char **argv)
/* /*
* XXX TODO: if we really wanted to be fancy, we could check the * XXX TODO: if we really wanted to be fancy, we could check the
* modules for all processes (not just the python[_d].exe ones) * modules for all processes (not just the python[_d].exe ones)
* and see if any of our DLLs are loaded (i.e. python33[_d].dll), * and see if any of our DLLs are loaded (i.e. python34[_d].dll),
* as that would also inhibit our ability to rebuild the solution. * as that would also inhibit our ability to rebuild the solution.
* Not worth loosing sleep over though; for now, a simple check * Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient. * for just the python executable should be sufficient.

View File

@ -13,7 +13,7 @@
<IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<PyDllName>python33$(PyDebugExt)</PyDllName> <PyDllName>python34$(PyDebugExt)</PyDllName>
<PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe> <PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
<KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe> <KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe>
<externalsDir>..\..</externalsDir> <externalsDir>..\..</externalsDir>

View File

@ -37,7 +37,7 @@ NOTE:
running a Python core buildbot test slave; see SUBPROJECTS below) running a Python core buildbot test slave; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to When using the Debug setting, the output files have a _d added to
their name: python33_d.dll, python_d.exe, parser_d.pyd, and so on. Both their name: python34_d.dll, python_d.exe, parser_d.pyd, and so on. Both
the build and rt batch files accept a -d option for debug builds. the build and rt batch files accept a -d option for debug builds.
The 32bit builds end up in the solution folder PCbuild while the x64 builds The 32bit builds end up in the solution folder PCbuild while the x64 builds

16
README
View File

@ -1,5 +1,5 @@
This is Python version 3.3.0 This is Python version 3.4.0 prerelease
============================ =======================================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012 Python Software Foundation. All rights reserved. 2012 Python Software Foundation. All rights reserved.
@ -52,9 +52,9 @@ What's New
---------- ----------
We try to have a comprehensive overview of the changes in the "What's New in We try to have a comprehensive overview of the changes in the "What's New in
Python 3.3" document, found at Python 3.4" document, found at
http://docs.python.org/3.3/whatsnew/3.3.html http://docs.python.org/3.4/whatsnew/3.4.html
For a more detailed change log, read Misc/NEWS (though this file, too, is For a more detailed change log, read Misc/NEWS (though this file, too, is
incomplete, and also doesn't list anything merged in from the 2.7 release under incomplete, and also doesn't list anything merged in from the 2.7 release under
@ -67,9 +67,9 @@ entitled "Installing multiple versions".
Documentation Documentation
------------- -------------
Documentation for Python 3.3 is online, updated daily: Documentation for Python 3.4 is online, updated daily:
http://docs.python.org/3.3/ http://docs.python.org/3.4/
It can also be downloaded in many formats for faster access. The documentation It can also be downloaded in many formats for faster access. The documentation
is downloadable in HTML, PDF, and reStructuredText formats; the latter version is downloadable in HTML, PDF, and reStructuredText formats; the latter version
@ -87,7 +87,7 @@ backported versions of certain key Python 3.x features.
A source-to-source translation tool, "2to3", can take care of the mundane task A source-to-source translation tool, "2to3", can take care of the mundane task
of converting large amounts of source code. It is not a complete solution but of converting large amounts of source code. It is not a complete solution but
is complemented by the deprecation warnings in 2.6. See is complemented by the deprecation warnings in 2.6. See
http://docs.python.org/3.3/library/2to3.html for more information. http://docs.python.org/3.4/library/2to3.html for more information.
Testing Testing
@ -125,7 +125,7 @@ same prefix you must decide which version (if any) is your "primary" version.
Install that version using "make install". Install all other versions using Install that version using "make install". Install all other versions using
"make altinstall". "make altinstall".
For example, if you want to install Python 2.6, 2.7 and 3.3 with 2.7 being the For example, if you want to install Python 2.6, 2.7 and 3.4 with 2.7 being the
primary version, you would execute "make install" in your 2.7 build directory primary version, you would execute "make install" in your 2.7 build directory
and "make altinstall" in the others. and "make altinstall" in the others.

20
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for python 3.3. # Generated by GNU Autoconf 2.68 for python 3.4.
# #
# Report bugs to <http://bugs.python.org/>. # Report bugs to <http://bugs.python.org/>.
# #
@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='python' PACKAGE_NAME='python'
PACKAGE_TARNAME='python' PACKAGE_TARNAME='python'
PACKAGE_VERSION='3.3' PACKAGE_VERSION='3.4'
PACKAGE_STRING='python 3.3' PACKAGE_STRING='python 3.4'
PACKAGE_BUGREPORT='http://bugs.python.org/' PACKAGE_BUGREPORT='http://bugs.python.org/'
PACKAGE_URL='' PACKAGE_URL=''
@ -1336,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures python 3.3 to adapt to many kinds of systems. \`configure' configures python 3.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1401,7 +1401,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of python 3.3:";; short | recursive ) echo "Configuration of python 3.4:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1539,7 +1539,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
python configure 3.3 python configure 3.4
generated by GNU Autoconf 2.68 generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
@ -2370,7 +2370,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by python $as_me 3.3, which was It was created by python $as_me 3.4, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@ $ $0 $@
@ -2920,7 +2920,7 @@ rm confdefs.h
mv confdefs.h.new confdefs.h mv confdefs.h.new confdefs.h
VERSION=3.3 VERSION=3.4
# Version number of Python's own shared library file. # Version number of Python's own shared library file.
@ -15562,7 +15562,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by python $as_me 3.3, which was This file was extended by python $as_me 3.4, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -15624,7 +15624,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
python config.status 3.3 python config.status 3.4
configured by $0, generated by GNU Autoconf 2.68, configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

View File

@ -3,7 +3,7 @@ dnl * Please run autoreconf to test your changes! *
dnl *********************************************** dnl ***********************************************
# Set VERSION so we only need to edit in one place (i.e., here) # Set VERSION so we only need to edit in one place (i.e., here)
m4_define(PYTHON_VERSION, 3.3) m4_define(PYTHON_VERSION, 3.4)
AC_PREREQ(2.65) AC_PREREQ(2.65)