Mailman 3 October 2004 - Python-checkins

python/dist/src/Python compile.c,2.330,2.331
by rhettinger＠users.sourceforge.net 24 Oct '04

24 Oct '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/Python Modified Files: compile.c Log Message: SF bug #1048870: call arg of lambda not updating Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.330 retrieving revision 2.331 diff -u -d -r2.330 -r2.331 --- compile.c 29 Sep 2004 23:54:08 -0000 2.330 +++ compile.c 24 Oct 2004 00:10:05 -0000 2.331 @@ -261,6 +261,8 @@ if (cmp) return (cmp<0)?-1:1; cmp = co->co_flags - cp->co_flags; if (cmp) return (cmp<0)?-1:1; + cmp = co->co_firstlineno - cp->co_firstlineno; + if (cmp) return (cmp<0)?-1:1; cmp = PyObject_Compare(co->co_code, cp->co_code); if (cmp) return cmp; cmp = PyObject_Compare(co->co_consts, cp->co_consts);

1 0

python/dist/src/Lib/test test_compile.py, 1.23, 1.24
by rhettinger＠users.sourceforge.net 24 Oct '04

24 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/Lib/test Modified Files: test_compile.py Log Message: SF bug #1048870: call arg of lambda not updating Index: test_compile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_compile.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- test_compile.py 31 Aug 2004 10:07:09 -0000 1.23 +++ test_compile.py 24 Oct 2004 00:10:06 -0000 1.24 @@ -252,6 +252,15 @@ for stmt in fail: self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'exec') + def test_for_distinct_code_objects(self): + # SF bug 1048870 + def f(): + f1 = lambda x=1: x + f2 = lambda x=2: x + return f1, f2 + f1, f2 = f() + self.assertNotEqual(id(f1.func_code), id(f2.func_code)) + def test_main(): test_support.run_unittest(TestSpecifics)

1 0

python/dist/src/Misc NEWS,1.1173,1.1174
by rhettinger＠users.sourceforge.net 24 Oct '04

24 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/Misc Modified Files: NEWS Log Message: SF bug #1048870: call arg of lambda not updating Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1173 retrieving revision 1.1174 diff -u -d -r1.1173 -r1.1174 --- NEWS 23 Oct 2004 03:43:54 -0000 1.1173 +++ NEWS 24 Oct 2004 00:10:03 -0000 1.1174 @@ -37,7 +37,10 @@ Extension Modules ----------------- -... +- Bug #1048870: the compiler now generates distinct code objects for + functions with identical bodies. This was producing confusing + traceback messages which pointed to the function where the code + object was first defined rather than the function being executed. Library -------

1 0

python/dist/src LICENSE,1.31,1.32
by tim_one＠users.sourceforge.net 23 Oct '04

23 Oct '04

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12761 Modified Files: LICENSE Log Message: Converted some stinking hard tabs. Left the fragrant hard tabs alone. Index: LICENSE =================================================================== RCS file: /cvsroot/python/python/dist/src/LICENSE,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- LICENSE 23 Oct 2004 03:43:53 -0000 1.31 +++ LICENSE 23 Oct 2004 03:48:57 -0000 1.32 @@ -26,7 +26,7 @@ the various releases. Release Derived Year Owner GPL- - from compatible? (1) + from compatible? (1) 0.9.0 thru 1.2 1991-1995 CWI yes 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes

1 0

python/dist/src/Misc NEWS,1.1172,1.1173
by tim_one＠users.sourceforge.net 23 Oct '04

23 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11868/Misc Modified Files: NEWS Log Message: Move to version 2 of the PSF license, approved by the Board earlier today. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1172 retrieving revision 1.1173 diff -u -d -r1.1172 -r1.1173 --- NEWS 22 Oct 2004 06:22:53 -0000 1.1172 +++ NEWS 23 Oct 2004 03:43:54 -0000 1.1173 @@ -9,6 +9,26 @@ *Release date: XX-XXX-XXXX* +License +------- + +The Python Software Foundation changed the license under which Python +is released, to remove Python version numbers. There were no other +changes to the license. So, for example, wherever the license for +Python 2.3 said "Python 2.3", the new license says "Python". The +intent is to make it possible to refer to the PSF license in a more +durable way. For example, some people say they're confused by that +the Open Source Initiative's entry for the Python Software Foundation +License:: + + http://www.opensource.org/licenses/PythonSoftFoundation.php + +says "Python 2.1.1" all over it, wondering whether it applies only +to Python 2.1.1. + +The official name of the new license is the Python Software Foundation +License Version 2. + Core and builtins ----------------- @@ -83,7 +103,7 @@ Core and builtins ----------------- -- Patch #975056: Restartable signals were not correctly disabled on +- Patch #975056: Restartable signals were not correctly disabled on BSD systems. Consistently use PyOS_setsig() instead of signal(). - The internal portable implementation of thread-local storage (TLS), used @@ -119,7 +139,7 @@ ------- - Patch 1046644: distutils build_ext grew two new options - --swig for - specifying the swig executable to use, and --swig-opts to specify + specifying the swig executable to use, and --swig-opts to specify options to pass to swig. --swig-opts="-c++" is the new way to spell --swig-cpp.

1 0

python/dist/src LICENSE,1.30,1.31
by tim_one＠users.sourceforge.net 23 Oct '04

23 Oct '04

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11868 Modified Files: LICENSE Log Message: Move to version 2 of the PSF license, approved by the Board earlier today. Index: LICENSE =================================================================== RCS file: /cvsroot/python/python/dist/src/LICENSE,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- LICENSE 8 Jul 2004 05:57:59 -0000 1.30 +++ LICENSE 23 Oct 2004 03:43:53 -0000 1.31 @@ -69,40 +69,40 @@ B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON =============================================================== -PSF LICENSE AGREEMENT FOR PYTHON 2.4 ------------------------------------- +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using Python 2.4 software in source or binary form and its +otherwise using Python software in source or binary form and its associated documentation. 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 2.4 +prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" -are retained in Python 2.4 alone or in any derivative version prepared +are retained in Python alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 2.4 or any part thereof, and wants to make +or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 2.4. +the changes made to Python. -4. PSF is making Python 2.4 available to Licensee on an "AS IS" +4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.4 WILL NOT +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -2.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.4, +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 6. This License Agreement will automatically terminate upon a material @@ -114,7 +114,7 @@ trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. -8. By copying, installing or otherwise using Python 2.4, Licensee +8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this License Agreement.

1 0

python/dist/src/Doc/lib liblogging.tex,1.27,1.28
by vsajip＠users.sourceforge.net 22 Oct '04

22 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23865 Modified Files: liblogging.tex Log Message: Added example of multiple destinations Index: liblogging.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblogging.tex,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- liblogging.tex 3 Oct 2004 19:10:05 -0000 1.27 +++ liblogging.tex 22 Oct 2004 21:43:15 -0000 1.28 @@ -507,15 +507,79 @@ datefmt='%a, %d %b %Y %H:%M:%S', filename='/temp/myapp.log', filemode='w') -logging.error('Pack my box with %d dozen %s', 12, 'liquor jugs') +logging.error('Pack my box with %d dozen %s', 5, 'liquor jugs') \end{verbatim} which would result in \begin{verbatim} -Wed, 21 Jul 2004 15:35:16 ERROR Pack my box with 12 dozen liquor jugs +Wed, 21 Jul 2004 15:35:16 ERROR Pack my box with 5 dozen liquor jugs +\end{verbatim} + +\subsection{Logging to multiple destinations \label{multiple-destinations}} + +Let's say you want to log to console and file with different message formats +and in differing circumstances. Say you want to log messages with levels +of DEBUG and higher to file, and those messages at level INFO and higher to +the console. Let's also assume that the file should contain timestamps, but +the console messages should not. Here's how you can achieve this: + +\begin{verbatim} +import logging + +#set up logging to file - see previous section for more details +logging.basicConfig(level=logging.DEBUG, + format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s', + datefmt='%m-%d %H:%M', + filename='/temp/myapp.log', + filemode='w') +#define a Handler which writes INFO messages or higher to the sys.stderr +console = logging.StreamHandler() +console.setLevel(logging.INFO) +#set a format which is simpler for console use +formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s') +#tell the handler to use this format +console.setFormatter(formatter) +#add the handler to the root logger +logging.getLogger('').addHandler(console) + +#Now, we can log to the root logger, or any other logger. First the root... +logging.info('Jackdaws love my big sphinx of quartz.') + +#Now, define a couple of other loggers which might represent areas in your +#application: + +logger1 = logging.getLogger('myapp.area1') +logger2 = logging.getLogger('myapp.area2') + +logger1.debug('Quick zephyrs blow, vexing daft Jim.') +logger1.info('How quickly daft jumping zebras vex.') +logger2.warning('Jail zesty vixen who grabbed pay from quack.') +logger2.error('The five boxing wizards jump quickly.') +\end{verbatim} + +When you run this, on the console you will see + +\begin{verbatim} +root : INFO Jackdaws love my big sphinx of quartz. +myapp.area1 : INFO How quickly daft jumping zebras vex. +myapp.area2 : WARNING Jail zesty vixen who grabbed pay from quack. +myapp.area2 : ERROR The five boxing wizards jump quickly. \end{verbatim} +and in the file you will see something like + +\begin{verbatim} +10-22 22:19 root INFO Jackdaws love my big sphinx of quartz. +10-22 22:19 myapp.area1 DEBUG Quick zephyrs blow, vexing daft Jim. +10-22 22:19 myapp.area1 INFO How quickly daft jumping zebras vex. +10-22 22:19 myapp.area2 WARNING Jail zesty vixen who grabbed pay from quack. +10-22 22:19 myapp.area2 ERROR The five boxing wizards jump quickly. +\end{verbatim} + +As you can see, the DEBUG message only shows up in the file. The other +messages are sent to both destinations. + \subsection{Handler Objects} Handlers have the following attributes and methods. Note that

1 0

python/dist/src/Lib warnings.py,1.21,1.21.6.1
by theller＠users.sourceforge.net 22 Oct '04

22 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3368 Modified Files: Tag: release23-maint warnings.py Log Message: Backport from trunk: SF bug 917108: warnings.py does not define _test(). Removed the entire __name__ == '__main__' block. Index: warnings.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/warnings.py,v retrieving revision 1.21 retrieving revision 1.21.6.1 diff -u -d -r1.21 -r1.21.6.1 --- warnings.py 11 Jul 2003 15:37:56 -0000 1.21 +++ warnings.py 22 Oct 2004 10:29:56 -0000 1.21.6.1 @@ -249,11 +249,6 @@ return cat # Module initialization -if __name__ == "__main__": - import __main__ - sys.modules['warnings'] = __main__ - _test() -else: - _processoptions(sys.warnoptions) - simplefilter("ignore", category=OverflowWarning, append=1) - simplefilter("ignore", category=PendingDeprecationWarning, append=1) +_processoptions(sys.warnoptions) +simplefilter("ignore", category=OverflowWarning, append=1) +simplefilter("ignore", category=PendingDeprecationWarning, append=1)

1 0

python/dist/src/Misc NEWS, 1.1171, 1.1172 ACKS, 1.286, 1.287
by bcannon＠users.sourceforge.net 22 Oct '04

22 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19923/Misc Modified Files: NEWS ACKS Log Message: Fix minor reST error in Misc/NEWS. Applies patch #1051866. Thanks Felix Wiemann. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1171 retrieving revision 1.1172 diff -u -d -r1.1171 -r1.1172 --- NEWS 20 Oct 2004 11:56:15 -0000 1.1171 +++ NEWS 22 Oct 2004 06:22:53 -0000 1.1172 @@ -134,6 +134,7 @@ Closes bug #1039270. - Updates for the email package: + + email.Utils.formatdate() grew a 'usegmt' argument for HTTP support. + All deprecated APIs that in email 2.x issued warnings have been removed: _encoder argument to the MIMEText constructor, Message.add_payload(), Index: ACKS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v retrieving revision 1.286 retrieving revision 1.287 diff -u -d -r1.286 -r1.287 --- ACKS 14 Oct 2004 10:02:04 -0000 1.286 +++ ACKS 22 Oct 2004 06:22:54 -0000 1.287 @@ -621,6 +621,7 @@ Rickard Westman Mats Wichmann Truida Wiedijk +Felix Wiemann Gerry Wiener Bryce "Zooko" Wilcox-O'Hearn Gerald S. Williams

1 0

python/dist/src/Misc/RPM python-2.4.spec,1.4,1.5
by jafo＠users.sourceforge.net 22 Oct '04

22 Oct '04

Update of /cvsroot/python/python/dist/src/Misc/RPM In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5780 Modified Files: python-2.4.spec Log Message: Latest version for beta 1. Index: python-2.4.spec =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/RPM/python-2.4.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- python-2.4.spec 15 Oct 2004 08:07:11 -0000 1.4 +++ python-2.4.spec 21 Oct 2004 23:35:45 -0000 1.5 @@ -25,6 +25,9 @@ %define config_ipv6 yes %define config_ipv6 no +# Location of the HTML directory. +%define config_htmldir /var/www/html/python + ################################# # End of user-modifiable configs ################################# @@ -40,6 +43,7 @@ %define pymalloc %(if [ "%{config_pymalloc}" = yes ]; then echo --with-pymalloc; else echo --without-pymalloc; fi) %define binsuffix %(if [ "%{config_binsuffix}" = none ]; then echo ; else echo "%{config_binsuffix}"; fi) %define include_tkinter %(if [ \$ "%{config_tkinter}" = auto -a -f /usr/bin/wish \$ -o "%{config_tkinter}" = yes ]; then echo 1; else echo 0; fi) +%define libdirname %(( uname -m | egrep -q '_64$' && [ -d /usr/lib64 ] && echo lib64 ) || echo lib) # detect if documentation is available %define include_docs %(if [ -f "%{_sourcedir}/html-%{version}.tar.bz2" ]; then echo 1; else echo 0; fi) @@ -50,7 +54,7 @@ Release: %{release} Copyright: Modified CNRI Open Source License Group: Development/Languages -Source: Python-%{version}.tgz +Source: Python-%{version}.tar.bz2 %if %{include_docs} Source1: html-%{version}.tar.bz2 %endif @@ -127,6 +131,15 @@ %endif %changelog +* Tue Oct 19 2004 Sean Reifschneider <jafo-rpms(a)tummy.com> [2.4b1-1pydotorg] +- Updating to 2.4. + +* Thu Jul 22 2004 Sean Reifschneider <jafo-rpms(a)tummy.com> [2.3.4-3pydotorg] +- Paul Tiemann fixes for %{prefix}. +- Adding permission changes for directory as suggested by reimeika.ca +- Adding code to detect when it should be using lib64. +- Adding a define for the location of /var/www/html for docs. + * Thu May 27 2004 Sean Reifschneider <jafo-rpms(a)tummy.com> [2.3.4-2pydotorg] - Including changes from Ian Holsman to build under Red Hat 7.3. - Fixing some problems with the /usr/local path change. @@ -213,10 +226,10 @@ %install # set the install path echo '[install_scripts]' >setup.cfg -echo 'install_dir='"${RPM_BUILD_ROOT}/usr/bin" >>setup.cfg +echo 'install_dir='"${RPM_BUILD_ROOT}%{__prefix}/bin" >>setup.cfg [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{__prefix}/lib/python%{libvers}/lib-dynload +mkdir -p $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}/lib-dynload make prefix=$RPM_BUILD_ROOT%{__prefix} install # REPLACE PATH IN PYDOC @@ -225,7 +238,7 @@ ( cd $RPM_BUILD_ROOT%{__prefix}/bin mv pydoc pydoc.old - sed 's|#!.*|#!/usr/bin/env python'%{binsuffix}'|' \ + sed 's|#!.*|#!%{__prefix}/bin/env python'%{binsuffix}'|' \ pydoc.old >pydoc chmod 755 pydoc rm -f pydoc.old @@ -244,14 +257,14 @@ ######## # Tools -echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix} -echo 'exec %{__prefix}/bin/python%{binsuffix} /usr/lib/python%{libvers}/idlelib/idle.py' >>$RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix} -chmod 755 $RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix} -cp -a Tools $RPM_BUILD_ROOT%{__prefix}/lib/python%{libvers} +echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix} +echo 'exec %{__prefix}/bin/python%{binsuffix} %{__prefix}/%{libdirname}/python%{libvers}/idlelib/idle.py' >>$RPM_BUILD_ROOT%{__prefix}/bin/idle%{binsuffix} +chmod 755 $RPM_BUILD_ROOT%{__prefix}/bin/idle%{binsuffix} +cp -a Tools $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers} # MAKE FILE LISTS rm -f mainpkg.files -find "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/lib-dynload -type f | +find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/lib-dynload -type f | sed "s|^${RPM_BUILD_ROOT}|/|" | grep -v -e '_tkinter.so$' >mainpkg.files find "$RPM_BUILD_ROOT""%{__prefix}"/bin -type f | @@ -259,17 +272,17 @@ grep -v -e '/bin/idle%{binsuffix}$' >>mainpkg.files rm -f tools.files -find "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/idlelib \ - "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/Tools -type f | +find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/idlelib \ + "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/Tools -type f | sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files ###### # Docs %if %{include_docs} -mkdir -p "$RPM_BUILD_ROOT"/var/www/html/python +mkdir -p "$RPM_BUILD_ROOT"%{config_htmldir} ( - cd "$RPM_BUILD_ROOT"/var/www/html/python + cd "$RPM_BUILD_ROOT"%{config_htmldir} bunzip2 < %{SOURCE1} | tar x ) %endif @@ -279,7 +292,7 @@ xargs -0 grep -l /usr/local/bin/python | while read file do FIXFILE="$file" - sed 's|^#!.*python|#!/usr/bin/env python'"%{binsuffix}"'|' \ + sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \ "$FIXFILE" >/tmp/fix-python-path.$$ cat /tmp/fix-python-path.$$ >"$FIXFILE" rm -f /tmp/fix-python-path.$$ @@ -321,30 +334,30 @@ %doc LICENSE Misc/ACKS Misc/HISTORY Misc/NEWS %{__prefix}/man/man1/python%{binsuffix}.1* -%dir %{__prefix}/include/python%{libvers} -%dir %{__prefix}/lib/python%{libvers}/ -%{__prefix}/lib/python%{libvers}/*.txt -%{__prefix}/lib/python%{libvers}/*.py* -%{__prefix}/lib/python%{libvers}/pdb.doc -%{__prefix}/lib/python%{libvers}/profile.doc -%{__prefix}/lib/python%{libvers}/curses -%{__prefix}/lib/python%{libvers}/distutils -%{__prefix}/lib/python%{libvers}/encodings -%{__prefix}/lib/python%{libvers}/plat-linux2 -%{__prefix}/lib/python%{libvers}/site-packages -%{__prefix}/lib/python%{libvers}/test -%{__prefix}/lib/python%{libvers}/xml -%{__prefix}/lib/python%{libvers}/email -%{__prefix}/lib/python%{libvers}/compiler -%{__prefix}/lib/python%{libvers}/bsddb -%{__prefix}/lib/python%{libvers}/hotshot -%{__prefix}/lib/python%{libvers}/logging -%{__prefix}/lib/python%{libvers}/lib-old +%attr(755,root,root) %dir %{__prefix}/include/python%{libvers} +%attr(755,root,root) %dir %{__prefix}/%{libdirname}/python%{libvers}/ +%{__prefix}/%{libdirname}/python%{libvers}/*.txt +%{__prefix}/%{libdirname}/python%{libvers}/*.py* +%{__prefix}/%{libdirname}/python%{libvers}/pdb.doc +%{__prefix}/%{libdirname}/python%{libvers}/profile.doc +%{__prefix}/%{libdirname}/python%{libvers}/curses +%{__prefix}/%{libdirname}/python%{libvers}/distutils +%{__prefix}/%{libdirname}/python%{libvers}/encodings +%{__prefix}/%{libdirname}/python%{libvers}/plat-linux2 +%{__prefix}/%{libdirname}/python%{libvers}/site-packages +%{__prefix}/%{libdirname}/python%{libvers}/test +%{__prefix}/%{libdirname}/python%{libvers}/xml +%{__prefix}/%{libdirname}/python%{libvers}/email +%{__prefix}/%{libdirname}/python%{libvers}/compiler +%{__prefix}/%{libdirname}/python%{libvers}/bsddb +%{__prefix}/%{libdirname}/python%{libvers}/hotshot +%{__prefix}/%{libdirname}/python%{libvers}/logging +%{__prefix}/%{libdirname}/python%{libvers}/lib-old %files devel %defattr(-,root,root) %{__prefix}/include/python%{libvers}/*.h -%{__prefix}/lib/python%{libvers}/config +%{__prefix}/%{libdirname}/python%{libvers}/config %files -f tools.files tools %defattr(-,root,root) @@ -352,12 +365,12 @@ %if %{include_tkinter} %files tkinter %defattr(-,root,root) -%{__prefix}/lib/python%{libvers}/lib-tk -%{__prefix}/lib/python%{libvers}/lib-dynload/_tkinter.so* +%{__prefix}/%{libdirname}/python%{libvers}/lib-tk +%{__prefix}/%{libdirname}/python%{libvers}/lib-dynload/_tkinter.so* %endif %if %{include_docs} %files docs %defattr(-,root,root) -/var/www/html/python/* +%{config_htmldir}/* %endif

1 0