Mailman 3 December 2004 - Python-checkins

python/dist/src setup.py,1.209,1.210
by bcannon＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1979 Modified Files: setup.py Log Message: Strip out double dashes and dashes for options not used during parsing of LDFLAGS and CPPFLAGS for library and include directories, respectively. Solves issue of either env var containing other options that do not pertain to the directories being searched for. Index: setup.py =================================================================== RCS file: /cvsroot/python/python/dist/src/setup.py,v retrieving revision 1.209 retrieving revision 1.210 diff -u -d -r1.209 -r1.210 --- setup.py 18 Dec 2004 20:48:09 -0000 1.209 +++ setup.py 31 Dec 2004 08:11:21 -0000 1.210 @@ -243,17 +243,31 @@ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS. + # CPPFLAGS for header and library files. # We must get the values from the Makefile and not the environment # directly since an inconsistently reproducible issue comes up where # the environment variable is not set even though the value were passed - # into configure and stored in the Makefile. + # into configure and stored in the Makefile (issue found on OS X 10.3). for env_var, arg_name, dir_list in ( ('LDFLAGS', '-L', self.compiler.library_dirs), ('CPPFLAGS', '-I', self.compiler.include_dirs)): env_val = sysconfig.get_config_var(env_var) if env_val: + # To prevent optparse from raising an exception about any + # options in env_val that is doesn't know about we strip out + # all double dashes and any dashes followed by a character + # that is not for the option we are dealing with. + # + # Please note that order of the regex is important! We must + # strip out double-dashes first so that we don't end up with + # substituting "--Long" to "-Long" and thus lead to "ong" being + # used for a library directory. + env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1], '', env_val) parser = optparse.OptionParser() + # Make sure that allowing args interspersed with options is + # allowed + parser.allow_interspersed_args = True + parser.error = lambda msg: None parser.add_option(arg_name, dest="dirs", action="append") options = parser.parse_args(env_val.split())[0] for directory in options.dirs:

1 0

python/dist/src/Doc/lib liboptparse.tex, 1.18, 1.18.2.1
by rhettinger＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31063 Modified Files: Tag: release24-maint liboptparse.tex Log Message: SF bug #1090139: presentation typo in lib: 6.21.4.2 How callbacks are called Index: liboptparse.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liboptparse.tex,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -d -r1.18 -r1.18.2.1 --- liboptparse.tex 12 Nov 2004 01:20:17 -0000 1.18 +++ liboptparse.tex 31 Dec 2004 01:08:17 -0000 1.18.2.1 @@ -1249,7 +1249,7 @@ also access or modify the value(s) of any options already encountered on the command-line. \end{description} -\item[\var{args}] +\item[\code{args}] is a tuple of arbitrary positional arguments supplied via the \code{callback{\_}args} option attribute. \item[\code{kwargs}]

1 0

python/dist/src/Doc/lib liboptparse.tex, 1.18, 1.19
by rhettinger＠users.sourceforge.net Dec. 31, 2004

Dec. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30869 Modified Files: liboptparse.tex Log Message: SF bug #1090139: presentation typo in lib: 6.21.4.2 How callbacks are called Index: liboptparse.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liboptparse.tex,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- liboptparse.tex 12 Nov 2004 01:20:17 -0000 1.18 +++ liboptparse.tex 31 Dec 2004 01:07:27 -0000 1.19 @@ -1249,7 +1249,7 @@ also access or modify the value(s) of any options already encountered on the command-line. \end{description} -\item[\var{args}] +\item[\code{args}] is a tuple of arbitrary positional arguments supplied via the \code{callback{\_}args} option attribute. \item[\code{kwargs}]

1 0

[Python-checkins] python/dist/src/Mac/OSX Makefile.panther, 1.1.2.5, 1.1.2.6
by jackjansen＠users.sourceforge.net Dec. 30, 2004

Dec. 30, 2004

Update of /cvsroot/python/python/dist/src/Mac/OSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1141 Modified Files: Tag: release23-maint Makefile.panther Log Message: Spaces in stead of tabs. Index: Makefile.panther =================================================================== RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Attic/Makefile.panther,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -d -r1.1.2.5 -r1.1.2.6 --- Makefile.panther 27 Dec 2004 16:41:52 -0000 1.1.2.5 +++ Makefile.panther 30 Dec 2004 22:43:29 -0000 1.1.2.6 @@ -54,5 +54,5 @@ ln -fsn $(APPLE_PYTHONLAUNCHER) $(DESTDIR)$(PYTHONAPPSDIR)/PythonLauncher install_pimpupdate: - cp ../../Lib/plat-mac/pimp.py $(DESTDIR)/Library/Python/2.3/pimp_update.py + cp ../../Lib/plat-mac/pimp.py $(DESTDIR)/Library/Python/2.3/pimp_update.py

1 0

python/dist/src/Tools/msi msi.py, 1.16.2.4, 1.16.2.5
by loewis＠users.sourceforge.net Dec. 30, 2004

Dec. 30, 2004

Update of /cvsroot/python/python/dist/src/Tools/msi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24211 Modified Files: Tag: release24-maint msi.py Log Message: Add more test directories to testsuite. Index: msi.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/msi/msi.py,v retrieving revision 1.16.2.4 retrieving revision 1.16.2.5 diff -u -d -r1.16.2.4 -r1.16.2.5 --- msi.py 22 Dec 2004 13:41:23 -0000 1.16.2.4 +++ msi.py 30 Dec 2004 14:09:14 -0000 1.16.2.5 @@ -882,7 +882,11 @@ if not have_tcl: continue tcltk.set_current() - elif dir in ['test', 'output']: + elif dir in ['test', 'tests', 'data', 'output']: + # test: Lib, Lib/email, Lib/bsddb + # tests: Lib/distutils + # data: Lib/email/test + # output: Lib/test testsuite.set_current() else: default_feature.set_current()

1 0

python/dist/src/Tools/msi msi.py,1.20,1.21
by loewis＠users.sourceforge.net Dec. 30, 2004

Dec. 30, 2004

Update of /cvsroot/python/python/dist/src/Tools/msi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23932 Modified Files: msi.py Log Message: Add more test directories to testsuite. Will backport to 2.4. Index: msi.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/msi/msi.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- msi.py 22 Dec 2004 13:41:49 -0000 1.20 +++ msi.py 30 Dec 2004 14:08:18 -0000 1.21 @@ -882,7 +882,11 @@ if not have_tcl: continue tcltk.set_current() - elif dir in ['test', 'output']: + elif dir in ['test', 'tests', 'data', 'output']: + # test: Lib, Lib/email, Lib/bsddb + # tests: Lib/distutils + # data: Lib/email/test + # output: Lib/test testsuite.set_current() else: default_feature.set_current()

1 0

[Python-checkins] python/dist/src/Modules socketmodule.c, 1.271.6.8, 1.271.6.9
by loewis＠users.sourceforge.net Dec. 30, 2004

Dec. 30, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20773 Modified Files: Tag: release23-maint socketmodule.c Log Message: Patch 728330: Fix compilation problems on IRIX. Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.271.6.8 retrieving revision 1.271.6.9 diff -u -d -r1.271.6.8 -r1.271.6.9 --- socketmodule.c 2 Jun 2004 12:36:49 -0000 1.271.6.8 +++ socketmodule.c 30 Dec 2004 13:52:17 -0000 1.271.6.9 @@ -192,8 +192,18 @@ /* XXX Using _SGIAPI is the wrong thing, but I don't know what the right thing is. */ +#undef _SGIAPI /* to avoid warning */ #define _SGIAPI 1 +#undef _XOPEN_SOURCE +#include <sys/socket.h> +#include <sys/types.h> +#include <netinet/in.h> +#ifdef _SS_ALIGNSIZE +#define HAVE_GETADDRINFO 1 +#define HAVE_GETNAMEINFO 1 +#endif + #define HAVE_INET_PTON #include <netdb.h> #endif @@ -259,7 +269,19 @@ # define O_NONBLOCK O_NDELAY #endif -#include "addrinfo.h" +/* include Python's addrinfo.h unless it causes trouble */ +#if defined(__sgi) && _COMPILER_VERSION>700 && defined(_SS_ALIGNSIZE) + /* Do not include addinfo.h on some newer IRIX versions. + * __SS_ALIGNSIZE is defined in sys/socket.h by 6.5.21, + * for example, but not by 6.5.10. + */ +#elif defined(_MSC_VER) && _MSC_VER>1200 + /* Do not include addrinfo.h for MSVC7 or greater. + * addrinfo and EAI_* constants are defined in ws2tcpip.h + */ +#else +# include "addrinfo.h" +#endif #ifndef HAVE_INET_PTON int inet_pton(int af, const char *src, void *dst);

1 0

python/dist/src/Doc/ext windows.tex,1.9,1.9.4.1
by loewis＠users.sourceforge.net Dec. 30, 2004

Dec. 30, 2004

Update of /cvsroot/python/python/dist/src/Doc/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17451 Modified Files: Tag: release24-maint windows.tex Log Message: Update to VC 7.1. Index: windows.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ext/windows.tex,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -u -d -r1.9 -r1.9.4.1 --- windows.tex 23 Jan 2004 09:01:56 -0000 1.9 +++ windows.tex 30 Dec 2004 10:44:50 -0000 1.9.4.1 @@ -39,10 +39,11 @@ To build extensions using these instructions, you need to have a copy of the Python sources of the same version as your installed Python. You will need Microsoft Visual \Cpp{} ``Developer Studio''; project -files are supplied for V\Cpp{} version 6, but you can use older -versions of V\Cpp. The example files described here are distributed -with the Python sources in the \file{PC\textbackslash -example_nt\textbackslash} directory. +files are supplied for V\Cpp{} version 7.1, but you can use older +versions of V\Cpp. Notice that you should use the same version of +V\Cpp that was used to build Python itself. The example files +described here are distributed with the Python sources in the +\file{PC\textbackslash example_nt\textbackslash} directory. \begin{enumerate} \item @@ -57,9 +58,9 @@ \item \strong{Open the project}\\ - From V\Cpp, use the \menuselection{File \sub Open Workspace} + From V\Cpp, use the \menuselection{File \sub Open Solution} dialog (not \menuselection{File \sub Open}!). Navigate to and - select the file \file{example.dsw}, in the \emph{copy} of the + select the file \file{example.sln}, in the \emph{copy} of the \file{example_nt} directory you made above. Click Open. \item @@ -69,18 +70,17 @@ \begin{enumerate} \item Select a configuration. This step is optional. Choose - \menuselection{Build \sub Select Active Configuration} and - select either \guilabel{example - Win32 Release} or - \guilabel{example - Win32 Debug}. If you skip this step, + \menuselection{Build \sub Configuration Manager \sub Active + Solution Configuration} and select either \guilabel{Release} + or\guilabel{Debug}. If you skip this step, V\Cpp{} will use the Debug configuration by default. \item Build the DLL. Choose \menuselection{Build \sub Build - example_d.dll} in Debug mode, or \menuselection{Build \sub - Build example.dll} in Release mode. This creates all - intermediate and result files in a subdirectory called either - \file{Debug} or \file{Release}, depending on which - configuration you selected in the preceding step. + Solution}. This creates all intermediate and result files in + a subdirectory called either \file{Debug} or \file{Release}, + depending on which configuration you selected in the preceding + step. \end{enumerate} \item @@ -129,7 +129,7 @@ Now your options are: \begin{enumerate} - \item Copy \file{example.dsw} and \file{example.dsp}, rename + \item Copy \file{example.sln} and \file{example.vcproj}, rename them to \file{spam.*}, and edit them by hand, or \item Create a brand new project; instructions are below. \end{enumerate} @@ -142,62 +142,62 @@ little file with only two lines. An alternative approach is to forget about the \file{.def} file, and add the option \programopt{/export:initspam} somewhere to the Link settings, by - manually editing the setting in Project Options dialog). + manually editing the setting in Project Properties dialog). \item \strong{Creating a brand new project}\\ - Use the \menuselection{File \sub New \sub Projects} dialog to - create a new Project Workspace. Select \guilabel{Win32 Dynamic-Link - Library}, enter the name (\samp{spam}), and make sure the - Location is set to the \file{spam} directory you have created - (which should be a direct subdirectory of the Python build tree, a - sibling of \file{Include} and \file{PC}). Select Win32 as the - platform (in my version, this is the only choice). Make sure the - Create new workspace radio button is selected. Click OK. + Use the \menuselection{File \sub New \sub Project} dialog to + create a new Project Workspace. Select \guilabel{Visual C++ + Projects/Win32/ Win32 Project}, enter the name (\samp{spam}), and + make sure the Location is set to parent of the \file{spam} + directory you have created (which should be a direct subdirectory + of the Python build tree, a sibling of \file{Include} and + \file{PC}). Select Win32 as the platform (in my version, this is + the only choice). Make sure the Create new workspace radio button + is selected. Click OK. - Now open the \menuselection{Project \sub Settings} dialog. You - only need to change a few settings. Make sure All Configurations - is selected from the Settings for: dropdown list. Select the - C/\Cpp{} tab. Choose the Preprocessor category in the popup menu - at the top. Type the following text in the entry box labeled - \guilabel{Additional include directories}: + You should now create the file \file{spam.def} as instructed in + the previous section. Add the source files to the project, using + \menuselection{Project \sub Add Existing Item}. Set the pattern to + \code{*.*} and select both \file{spam.c} and \file{spam.def} and + click OK. (Inserting them one by one is fine too.) + + Now open the \menuselection{Project \sub spam properties} dialog. + You only need to change a few settings. Make sure \guilable{All + Configurations} is selected from the \guilable{Settings for:} + dropdown list. Select the C/\Cpp{} tab. Choose the General + category in the popup menu at the top. Type the following text in + the entry box labeled \guilabel{Additional Include Directories}: \begin{verbatim} ..\Include,..\PC \end{verbatim} - Then, choose the Input category in the Link tab, and enter + Then, choose the General category in the Linker tab, and enter \begin{verbatim} ..\PCbuild \end{verbatim} - in the text box labelled \guilabel{Additional library path}. + in the text box labelled \guilabel{Additional library Directories}. Now you need to add some mode-specific settings: - Select \guilabel{Win32 Release} in the \guilabel{Settings for} + Select \guilabel{Release} in the \guilabel{Configuration} dropdown list. Choose the \guilabel{Link} tab, choose the - \guilabel{Input Category}, and append \code{pythonXY.lib} to the - list in the \guilabel{Object/library modules} box. - - Select \guilabel{Win32 Debug} in the \guilabel{Settings for} - dropdown list, and append \code{pythonXY_d.lib} to the list in the - \guilabel{Object/library modules} box. Then click the C/\Cpp{} - tab, select \guilabel{Code Generation} from the - \guilabel{Category} dropdown list, and select \guilabel{Debug - Multithreaded DLL} from the \guilabel{Use run-time library} dropdown - list. + \guilabel{Input} category, and append \code{pythonXY.lib} to the + list in the \guilabel{Additional Dependencies} box. - Select \guilabel{Win32 Release} again from the \guilabel{Settings - for} dropdown list. Select \guilabel{Multithreaded DLL} from the - \guilabel{Use run-time library:} dropdown list. + Select \guilabel{Debug} in the \guilabel{Configuration} dropdown + list, and append \code{pythonXY_d.lib} to the list in the + \guilabel{Additional Dependencies} box. Then click the C/\Cpp{} + tab, select \guilabel{Code Generation}, and select + \guilabel{Multi-threaded Debug DLL} from the \guilabel{Runtime + library} dropdown list. - You should now create the file \file{spam.def} as instructed in the - previous section. Then chose the \menuselection{Insert \sub Files - into Project} dialog. Set the pattern to \code{*.*} and select - both \file{spam.c} and \file{spam.def} and click OK. (Inserting - them one by one is fine too.) + Select \guilabel{Release} again from the \guilabel{Configuration} + dropdown list. Select \guilabel{Multi-threaded DLL} from the + \guilabel{Runtime library} dropdown list. \end{enumerate}

1 0

python/dist/src/Doc/ext windows.tex,1.9,1.10
by loewis＠users.sourceforge.net Dec. 30, 2004

Dec. 30, 2004

Update of /cvsroot/python/python/dist/src/Doc/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17396 Modified Files: windows.tex Log Message: Update to VC 7.1. Will backport to 2.4. Index: windows.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ext/windows.tex,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- windows.tex 23 Jan 2004 09:01:56 -0000 1.9 +++ windows.tex 30 Dec 2004 10:44:32 -0000 1.10 @@ -39,10 +39,11 @@ To build extensions using these instructions, you need to have a copy of the Python sources of the same version as your installed Python. You will need Microsoft Visual \Cpp{} ``Developer Studio''; project -files are supplied for V\Cpp{} version 6, but you can use older -versions of V\Cpp. The example files described here are distributed -with the Python sources in the \file{PC\textbackslash -example_nt\textbackslash} directory. +files are supplied for V\Cpp{} version 7.1, but you can use older +versions of V\Cpp. Notice that you should use the same version of +V\Cpp that was used to build Python itself. The example files +described here are distributed with the Python sources in the +\file{PC\textbackslash example_nt\textbackslash} directory. \begin{enumerate} \item @@ -57,9 +58,9 @@ \item \strong{Open the project}\\ - From V\Cpp, use the \menuselection{File \sub Open Workspace} + From V\Cpp, use the \menuselection{File \sub Open Solution} dialog (not \menuselection{File \sub Open}!). Navigate to and - select the file \file{example.dsw}, in the \emph{copy} of the + select the file \file{example.sln}, in the \emph{copy} of the \file{example_nt} directory you made above. Click Open. \item @@ -69,18 +70,17 @@ \begin{enumerate} \item Select a configuration. This step is optional. Choose - \menuselection{Build \sub Select Active Configuration} and - select either \guilabel{example - Win32 Release} or - \guilabel{example - Win32 Debug}. If you skip this step, + \menuselection{Build \sub Configuration Manager \sub Active + Solution Configuration} and select either \guilabel{Release} + or\guilabel{Debug}. If you skip this step, V\Cpp{} will use the Debug configuration by default. \item Build the DLL. Choose \menuselection{Build \sub Build - example_d.dll} in Debug mode, or \menuselection{Build \sub - Build example.dll} in Release mode. This creates all - intermediate and result files in a subdirectory called either - \file{Debug} or \file{Release}, depending on which - configuration you selected in the preceding step. + Solution}. This creates all intermediate and result files in + a subdirectory called either \file{Debug} or \file{Release}, + depending on which configuration you selected in the preceding + step. \end{enumerate} \item @@ -129,7 +129,7 @@ Now your options are: \begin{enumerate} - \item Copy \file{example.dsw} and \file{example.dsp}, rename + \item Copy \file{example.sln} and \file{example.vcproj}, rename them to \file{spam.*}, and edit them by hand, or \item Create a brand new project; instructions are below. \end{enumerate} @@ -142,62 +142,62 @@ little file with only two lines. An alternative approach is to forget about the \file{.def} file, and add the option \programopt{/export:initspam} somewhere to the Link settings, by - manually editing the setting in Project Options dialog). + manually editing the setting in Project Properties dialog). \item \strong{Creating a brand new project}\\ - Use the \menuselection{File \sub New \sub Projects} dialog to - create a new Project Workspace. Select \guilabel{Win32 Dynamic-Link - Library}, enter the name (\samp{spam}), and make sure the - Location is set to the \file{spam} directory you have created - (which should be a direct subdirectory of the Python build tree, a - sibling of \file{Include} and \file{PC}). Select Win32 as the - platform (in my version, this is the only choice). Make sure the - Create new workspace radio button is selected. Click OK. + Use the \menuselection{File \sub New \sub Project} dialog to + create a new Project Workspace. Select \guilabel{Visual C++ + Projects/Win32/ Win32 Project}, enter the name (\samp{spam}), and + make sure the Location is set to parent of the \file{spam} + directory you have created (which should be a direct subdirectory + of the Python build tree, a sibling of \file{Include} and + \file{PC}). Select Win32 as the platform (in my version, this is + the only choice). Make sure the Create new workspace radio button + is selected. Click OK. - Now open the \menuselection{Project \sub Settings} dialog. You - only need to change a few settings. Make sure All Configurations - is selected from the Settings for: dropdown list. Select the - C/\Cpp{} tab. Choose the Preprocessor category in the popup menu - at the top. Type the following text in the entry box labeled - \guilabel{Additional include directories}: + You should now create the file \file{spam.def} as instructed in + the previous section. Add the source files to the project, using + \menuselection{Project \sub Add Existing Item}. Set the pattern to + \code{*.*} and select both \file{spam.c} and \file{spam.def} and + click OK. (Inserting them one by one is fine too.) + + Now open the \menuselection{Project \sub spam properties} dialog. + You only need to change a few settings. Make sure \guilable{All + Configurations} is selected from the \guilable{Settings for:} + dropdown list. Select the C/\Cpp{} tab. Choose the General + category in the popup menu at the top. Type the following text in + the entry box labeled \guilabel{Additional Include Directories}: \begin{verbatim} ..\Include,..\PC \end{verbatim} - Then, choose the Input category in the Link tab, and enter + Then, choose the General category in the Linker tab, and enter \begin{verbatim} ..\PCbuild \end{verbatim} - in the text box labelled \guilabel{Additional library path}. + in the text box labelled \guilabel{Additional library Directories}. Now you need to add some mode-specific settings: - Select \guilabel{Win32 Release} in the \guilabel{Settings for} + Select \guilabel{Release} in the \guilabel{Configuration} dropdown list. Choose the \guilabel{Link} tab, choose the - \guilabel{Input Category}, and append \code{pythonXY.lib} to the - list in the \guilabel{Object/library modules} box. - - Select \guilabel{Win32 Debug} in the \guilabel{Settings for} - dropdown list, and append \code{pythonXY_d.lib} to the list in the - \guilabel{Object/library modules} box. Then click the C/\Cpp{} - tab, select \guilabel{Code Generation} from the - \guilabel{Category} dropdown list, and select \guilabel{Debug - Multithreaded DLL} from the \guilabel{Use run-time library} dropdown - list. + \guilabel{Input} category, and append \code{pythonXY.lib} to the + list in the \guilabel{Additional Dependencies} box. - Select \guilabel{Win32 Release} again from the \guilabel{Settings - for} dropdown list. Select \guilabel{Multithreaded DLL} from the - \guilabel{Use run-time library:} dropdown list. + Select \guilabel{Debug} in the \guilabel{Configuration} dropdown + list, and append \code{pythonXY_d.lib} to the list in the + \guilabel{Additional Dependencies} box. Then click the C/\Cpp{} + tab, select \guilabel{Code Generation}, and select + \guilabel{Multi-threaded Debug DLL} from the \guilabel{Runtime + library} dropdown list. - You should now create the file \file{spam.def} as instructed in the - previous section. Then chose the \menuselection{Insert \sub Files - into Project} dialog. Set the pattern to \code{*.*} and select - both \file{spam.c} and \file{spam.def} and click OK. (Inserting - them one by one is fine too.) + Select \guilabel{Release} again from the \guilabel{Configuration} + dropdown list. Select \guilabel{Multi-threaded DLL} from the + \guilabel{Runtime library} dropdown list. \end{enumerate}

1 0

python/dist/src/Lib/test test_codecs.py, 1.16, 1.17
by doerwalter＠users.sourceforge.net Dec. 29, 2004

Dec. 29, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5806/Lib/test Modified Files: test_codecs.py Log Message: Add a test that checks the basic functionality of every encoding. Index: test_codecs.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_codecs.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- test_codecs.py 21 Dec 2004 22:24:00 -0000 1.16 +++ test_codecs.py 29 Dec 2004 16:04:38 -0000 1.17 @@ -549,6 +549,182 @@ f = self.reader(self.stream) self.assertEquals(f.readlines(), [u'\ud55c\n', u'\uae00']) +all_unicode_encodings = [ + "ascii", + "base64_codec", + "big5", + "big5hkscs", + "charmap", + "cp037", + "cp1006", + "cp1026", + "cp1140", + "cp1250", + "cp1251", + "cp1252", + "cp1253", + "cp1254", + "cp1255", + "cp1256", + "cp1257", + "cp1258", + "cp424", + "cp437", + "cp500", + "cp737", + "cp775", + "cp850", + "cp852", + "cp855", + "cp856", + "cp857", + "cp860", + "cp861", + "cp862", + "cp863", + "cp864", + "cp865", + "cp866", + "cp869", + "cp874", + "cp875", + "cp932", + "cp949", + "cp950", + "euc_jis_2004", + "euc_jisx0213", + "euc_jp", + "euc_kr", + "gb18030", + "gb2312", + "gbk", + "hex_codec", + "hp_roman8", + "hz", + "idna", + "iso2022_jp", + "iso2022_jp_1", + "iso2022_jp_2", + "iso2022_jp_2004", + "iso2022_jp_3", + "iso2022_jp_ext", + "iso2022_kr", + "iso8859_1", + "iso8859_10", + "iso8859_11", + "iso8859_13", + "iso8859_14", + "iso8859_15", + "iso8859_16", + "iso8859_2", + "iso8859_3", + "iso8859_4", + "iso8859_5", + "iso8859_6", + "iso8859_7", + "iso8859_8", + "iso8859_9", + "johab", + "koi8_r", + "koi8_u", + "latin_1", + "mac_cyrillic", + "mac_greek", + "mac_iceland", + "mac_latin2", + "mac_roman", + "mac_turkish", + "palmos", + "ptcp154", + "punycode", + "raw_unicode_escape", + "rot_13", + "shift_jis", + "shift_jis_2004", + "shift_jisx0213", + "tis_620", + "unicode_escape", + "unicode_internal", + "utf_16", + "utf_16_be", + "utf_16_le", + "utf_7", + "utf_8", +] + +if hasattr(codecs, "mbcs_encode"): + all_unicode_encodings.append("mbcs") + +# The following encodings work only with str, not unicode +all_string_encodings = [ + "quopri_codec", + "string_escape", + "uu_codec", +] + +# The following encoding is not tested, because it's not supposed +# to work: +# "undefined" + +# The following encodings don't work in stateful mode +broken_unicode_with_streams = [ + "base64_codec", + "hex_codec", + "punycode", + "unicode_internal" +] + +try: + import bz2 +except ImportError: + pass +else: + all_unicode_encodings.append("bz2_codec") + broken_unicode_with_streams.append("bz2_codec") + +try: + import zlib +except ImportError: + pass +else: + all_unicode_encodings.append("zlib_codec") + broken_unicode_with_streams.append("zlib_codec") + +class BasicUnicodeTest(unittest.TestCase): + def test_basics(self): + s = u"abc123" # all codecs should be able to encode these + for encoding in all_unicode_encodings: + (bytes, size) = codecs.getencoder(encoding)(s) + if encoding != "unicode_internal": + self.assertEqual(size, len(s), "%r != %r (encoding=%r)" % (size, len(s), encoding)) + (chars, size) = codecs.getdecoder(encoding)(bytes) + self.assertEqual(chars, s, "%r != %r (encoding=%r)" % (chars, s, encoding)) + + if encoding not in broken_unicode_with_streams: + # check stream reader/writer + q = Queue() + writer = codecs.getwriter(encoding)(q) + encodedresult = "" + for c in s: + writer.write(c) + encodedresult += q.read() + q = Queue() + reader = codecs.getreader(encoding)(q) + decodedresult = u"" + for c in encodedresult: + q.write(c) + decodedresult += reader.read() + self.assertEqual(decodedresult, s, "%r != %r (encoding=%r)" % (decodedresult, s, encoding)) + +class BasicStrTest(unittest.TestCase): + def test_basics(self): + s = "abc123" + for encoding in all_string_encodings: + (bytes, size) = codecs.getencoder(encoding)(s) + self.assertEqual(size, len(s)) + (chars, size) = codecs.getdecoder(encoding)(bytes) + self.assertEqual(chars, s, "%r != %r (encoding=%r)" % (chars, s, encoding)) + def test_main(): test_support.run_unittest( UTF16Test, @@ -561,7 +737,9 @@ NameprepTest, CodecTest, CodecsModuleTest, - StreamReaderTest + StreamReaderTest, + BasicUnicodeTest, + BasicStrTest )

1 0