[Python-checkins] r71287 - in python/branches/py3k-short-float-repr: Doc/c-api/init.rst Doc/c-api/number.rst Doc/c-api/object.rst Doc/c-api/structures.rst Doc/c-api/veryhigh.rst Doc/distutils/apiref.rst Doc/extending/extending.rst Doc/howto/cporting.rst Doc/library/abc.rst Doc/library/doctest.rst Doc/library/functions.rst Doc/library/itertools.rst Doc/library/logging.rst Doc/library/multiprocessing.rst Doc/library/os.path.rst Doc/library/os.rst Doc/library/pdb.rst Doc/library/pickle.rst Doc/library/re.rst Doc/library/shelve.rst Doc/library/socketserver.rst Doc/library/ssl.rst Doc/library/stdtypes.rst Doc/library/sys.rst Doc/library/threading.rst Doc/library/tkinter.ttk.rst Doc/library/urllib.request.rst Doc/library/webbrowser.rst Doc/library/winreg.rst Doc/reference/datamodel.rst Doc/tutorial/datastructures.rst Doc/tutorial/introduction.rst Doc/whatsnew/2.6.rst Doc/whatsnew/2.7.rst Include/patchlevel.h Lib/distutils/cmd.py Lib/distutils/log.py Lib/distutils/tests/test_clean.py Lib/ftplib.py Lib/glob.py Lib/multiprocessing/synchronize.py Lib/optparse.py Lib/pdb.py Lib/pydoc.py Lib/test/README Lib/test/test_logging.py Lib/test/test_multiprocessing.py Lib/test/test_pprint.py Lib/test/test_sys.py Lib/test/test_threading.py Lib/test/test_traceback.py Lib/threading.py Lib/traceback.py Makefile.pre.in Misc/ACKS Misc/NEWS Misc/developers.txt Modules/_io/_iomodule.c Modules/_io/bufferedio.c Modules/_multiprocessing/connection.h Modules/_multiprocessing/multiprocessing.c Modules/_multiprocessing/multiprocessing.h Modules/_multiprocessing/pipe_connection.c Modules/_multiprocessing/semaphore.c Modules/_sqlite/connection.c Modules/_sqlite/module.c Modules/_tkinter.c Objects/genobject.c Objects/object.c configure configure.in pyconfig.h.in setup.py
eric.smith
python-checkins at python.org
Mon Apr 6 00:11:44 CEST 2009
Author: eric.smith
Date: Mon Apr 6 00:11:42 2009
New Revision: 71287
Log:
Merged revisions 71202,71205,71207,71209,71223-71224,71239,71242,71254,71259,71261-71262,71267,71274 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r71202 | benjamin.peterson | 2009-04-04 19:16:41 -0400 (Sat, 04 Apr 2009) | 1 line
bump version for 3.1a2+
................
r71205 | benjamin.peterson | 2009-04-04 20:46:27 -0400 (Sat, 04 Apr 2009) | 1 line
fix typo #5687
................
r71207 | benjamin.peterson | 2009-04-04 21:13:10 -0400 (Sat, 04 Apr 2009) | 8 lines
Blocked revisions 71206 via svnmerge
........
r71206 | benjamin.peterson | 2009-04-04 20:04:38 -0500 (Sat, 04 Apr 2009) | 1 line
compare types with is
........
................
r71209 | alexandre.vassalotti | 2009-04-04 21:30:02 -0400 (Sat, 04 Apr 2009) | 2 lines
Initialize the tk_init_failed static variable to 0.
................
r71223 | georg.brandl | 2009-04-05 07:11:12 -0400 (Sun, 05 Apr 2009) | 1 line
#5606: fix formatter.h dependencies in the Makefile.
................
r71224 | georg.brandl | 2009-04-05 07:47:34 -0400 (Sun, 05 Apr 2009) | 1 line
Merge revision 71222 from trunk: #5615: make it possible to configure --without-threads again.
................
r71239 | georg.brandl | 2009-04-05 10:28:42 -0400 (Sun, 05 Apr 2009) | 13 lines
Merged revisions 71237-71238 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71237 | georg.brandl | 2009-04-05 16:24:52 +0200 (So, 05 Apr 2009) | 1 line
#1326077: fix traceback formatting of SyntaxErrors. This fixes two differences with formatting coming from Python: a) the reproduction of location details in the error message if no line text is given, b) the prefixing of the last line by one space.
........
r71238 | georg.brandl | 2009-04-05 16:25:41 +0200 (So, 05 Apr 2009) | 1 line
Add NEWS entry for r71237.
........
................
r71242 | georg.brandl | 2009-04-05 11:05:48 -0400 (Sun, 05 Apr 2009) | 1 line
#5453: fix SyntaxErrors using pydoc -k, caused by intentionally bad files in Pythons test suite.
................
r71254 | tarek.ziade | 2009-04-05 14:33:34 -0400 (Sun, 05 Apr 2009) | 9 lines
Merged revisions 71253 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71253 | tarek.ziade | 2009-04-05 20:31:24 +0200 (Sun, 05 Apr 2009) | 1 line
Fixed 5694: removed spurious test output in Distutils
........
................
r71259 | brett.cannon | 2009-04-05 14:57:32 -0400 (Sun, 05 Apr 2009) | 8 lines
Blocked revisions 71221 via svnmerge
........
r71221 | vinay.sajip | 2009-04-05 04:06:24 -0700 (Sun, 05 Apr 2009) | 1 line
Issue #5695: Moved logging.captureWarnings() call inside with statement in WarningsTest.test_warnings.
........
................
r71261 | benjamin.peterson | 2009-04-05 15:13:16 -0400 (Sun, 05 Apr 2009) | 295 lines
Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70712 | benjamin.peterson | 2009-03-30 10:15:38 -0500 (Mon, 30 Mar 2009) | 1 line
don't rely on the order dict repr #5605
........
r70714 | brett.cannon | 2009-03-30 10:20:53 -0500 (Mon, 30 Mar 2009) | 1 line
Add an entry to developers.txt.
........
r70764 | martin.v.loewis | 2009-03-30 17:06:33 -0500 (Mon, 30 Mar 2009) | 2 lines
Add several VM developers.
........
r70765 | georg.brandl | 2009-03-30 17:09:34 -0500 (Mon, 30 Mar 2009) | 1 line
#5199: make warning about vars() assignment more visible.
........
r70769 | andrew.kuchling | 2009-03-30 17:29:53 -0500 (Mon, 30 Mar 2009) | 1 line
Remove comment
........
r70770 | andrew.kuchling | 2009-03-30 17:30:20 -0500 (Mon, 30 Mar 2009) | 1 line
Add several items and placeholders
........
r70771 | andrew.kuchling | 2009-03-30 17:31:11 -0500 (Mon, 30 Mar 2009) | 1 line
Many edits
........
r70773 | georg.brandl | 2009-03-30 17:43:00 -0500 (Mon, 30 Mar 2009) | 1 line
#5039: make it clear that the impl. note refers to CPython.
........
r70776 | andrew.kuchling | 2009-03-30 18:08:24 -0500 (Mon, 30 Mar 2009) | 1 line
typo fix
........
r70777 | andrew.kuchling | 2009-03-30 18:09:46 -0500 (Mon, 30 Mar 2009) | 1 line
Add more items
........
r70788 | andrew.kuchling | 2009-03-30 20:21:01 -0500 (Mon, 30 Mar 2009) | 1 line
Add various items
........
r70789 | georg.brandl | 2009-03-30 20:25:15 -0500 (Mon, 30 Mar 2009) | 1 line
Fix a wrong struct field assignment (docstring as closure).
........
r70824 | georg.brandl | 2009-03-31 10:43:20 -0500 (Tue, 31 Mar 2009) | 1 line
#5519: remove reference to Kodos, which seems dead.
........
r70828 | georg.brandl | 2009-03-31 10:50:16 -0500 (Tue, 31 Mar 2009) | 1 line
#5581: fget argument of abstractproperty is optional as well.
........
r70832 | georg.brandl | 2009-03-31 11:31:11 -0500 (Tue, 31 Mar 2009) | 1 line
#1386675: specify WindowsError as the exception, because it has a winerror attribute that EnvironmentError doesnt have.
........
r70836 | georg.brandl | 2009-03-31 11:50:25 -0500 (Tue, 31 Mar 2009) | 1 line
#5417: replace references to undocumented functions by ones to documented functions.
........
r70842 | georg.brandl | 2009-03-31 12:13:06 -0500 (Tue, 31 Mar 2009) | 1 line
#970783: document PyObject_Generic[GS]etAttr.
........
r70851 | georg.brandl | 2009-03-31 13:26:55 -0500 (Tue, 31 Mar 2009) | 1 line
#837577: note cryptic return value of spawn*e on invalid env dicts.
........
r70855 | georg.brandl | 2009-03-31 13:30:37 -0500 (Tue, 31 Mar 2009) | 1 line
#5245: note that PyRun_SimpleString doesnt return on SystemExit.
........
r70857 | georg.brandl | 2009-03-31 13:33:10 -0500 (Tue, 31 Mar 2009) | 1 line
#5227: note that Py_Main doesnt return on SystemExit.
........
r70866 | georg.brandl | 2009-03-31 14:06:57 -0500 (Tue, 31 Mar 2009) | 1 line
#4882: document named group behavior a bit better.
........
r70867 | georg.brandl | 2009-03-31 14:10:35 -0500 (Tue, 31 Mar 2009) | 1 line
#1096310: document usage of sys.__std*__ a bit better.
........
r70868 | georg.brandl | 2009-03-31 14:12:17 -0500 (Tue, 31 Mar 2009) | 1 line
#5190: export make_option in __all__.
........
r70869 | georg.brandl | 2009-03-31 14:14:42 -0500 (Tue, 31 Mar 2009) | 1 line
Fix-up unwanted change.
........
r70870 | georg.brandl | 2009-03-31 14:26:24 -0500 (Tue, 31 Mar 2009) | 1 line
#4411: document mro() and __mro__. (I hope I got it right.)
........
r70871 | georg.brandl | 2009-03-31 14:30:56 -0500 (Tue, 31 Mar 2009) | 1 line
#5618: fix typo.
........
r70872 | r.david.murray | 2009-03-31 14:31:17 -0500 (Tue, 31 Mar 2009) | 3 lines
Delete out-of-date and little-known README from the test
directory by consensus of devs at pycon sprint.
........
r70883 | georg.brandl | 2009-03-31 15:41:08 -0500 (Tue, 31 Mar 2009) | 1 line
#1674032: return value of flag from Event.wait(). OKed by Guido.
........
r70885 | tarek.ziade | 2009-03-31 15:48:31 -0500 (Tue, 31 Mar 2009) | 1 line
using log.warn for sys.stderr
........
r70893 | georg.brandl | 2009-03-31 15:56:32 -0500 (Tue, 31 Mar 2009) | 1 line
#1530012: move TQS section before raw strings.
........
r70894 | benjamin.peterson | 2009-03-31 16:06:30 -0500 (Tue, 31 Mar 2009) | 1 line
take the usual lock precautions around _active_limbo_lock
........
r70896 | georg.brandl | 2009-03-31 16:15:33 -0500 (Tue, 31 Mar 2009) | 1 line
#5598: document DocFileSuite *args argument.
........
r70897 | benjamin.peterson | 2009-03-31 16:34:42 -0500 (Tue, 31 Mar 2009) | 1 line
fix Thread.ident when it is the main thread or a dummy thread #5632
........
r70903 | georg.brandl | 2009-03-31 16:45:18 -0500 (Tue, 31 Mar 2009) | 1 line
#1676135: remove trailing slashes from --prefix argument.
........
r70905 | georg.brandl | 2009-03-31 17:03:40 -0500 (Tue, 31 Mar 2009) | 1 line
#5563: more documentation for bdist_msi.
........
r70906 | georg.brandl | 2009-03-31 17:11:53 -0500 (Tue, 31 Mar 2009) | 1 line
#1651995: fix _convert_ref for non-ASCII characters.
........
r70907 | georg.brandl | 2009-03-31 17:18:19 -0500 (Tue, 31 Mar 2009) | 1 line
#3427: document correct return type for urlopen().info().
........
r70915 | georg.brandl | 2009-03-31 17:40:16 -0500 (Tue, 31 Mar 2009) | 1 line
#5018: remove confusing paragraph.
........
r70927 | georg.brandl | 2009-03-31 18:01:27 -0500 (Tue, 31 Mar 2009) | 1 line
Dont shout to users.
........
r70933 | georg.brandl | 2009-03-31 19:04:33 -0500 (Tue, 31 Mar 2009) | 2 lines
Issue #5635: Fix running test_sys with tracing enabled.
........
r70951 | georg.brandl | 2009-04-01 09:02:27 -0500 (Wed, 01 Apr 2009) | 1 line
Add Maksim, who worked on several issues at the sprint.
........
r70960 | jesse.noller | 2009-04-01 11:42:19 -0500 (Wed, 01 Apr 2009) | 1 line
Issue 3270: document Listener address restrictions on windows
........
r70962 | brett.cannon | 2009-04-01 12:07:16 -0500 (Wed, 01 Apr 2009) | 2 lines
Ron DuPlain was given commit privileges at PyCon 2009 to work on 3to2.
........
r70963 | georg.brandl | 2009-04-01 12:46:01 -0500 (Wed, 01 Apr 2009) | 1 line
#5655: fix docstring oversight.
........
r70964 | brett.cannon | 2009-04-01 12:52:13 -0500 (Wed, 01 Apr 2009) | 2 lines
Paul Kippes was given commit privileges to work on 3to2.
........
r70998 | georg.brandl | 2009-04-01 16:54:21 -0500 (Wed, 01 Apr 2009) | 1 line
In Pdb, stop assigning values to __builtin__._ which interferes with the one commonly installed by gettext.
........
r71001 | brett.cannon | 2009-04-01 18:01:12 -0500 (Wed, 01 Apr 2009) | 3 lines
Add my initials to Misc/developers.txt. Names are now sorted by number of
characters in the person's name.
........
r71006 | georg.brandl | 2009-04-01 18:32:17 -0500 (Wed, 01 Apr 2009) | 1 line
Cache the f_locals dict of the current frame, since every access to frame.f_locals overrides its contents with the real locals which undoes modifications made by the debugging user.
........
r71008 | andrew.kuchling | 2009-04-01 19:02:14 -0500 (Wed, 01 Apr 2009) | 1 line
Typo fix
........
r71010 | benjamin.peterson | 2009-04-01 19:11:52 -0500 (Wed, 01 Apr 2009) | 1 line
fix markup
........
r71011 | benjamin.peterson | 2009-04-01 19:12:47 -0500 (Wed, 01 Apr 2009) | 1 line
this should be :noindex:
........
r71019 | georg.brandl | 2009-04-01 21:00:01 -0500 (Wed, 01 Apr 2009) | 1 line
Fix test_doctest, missed two assignments to curframe.
........
r71037 | r.david.murray | 2009-04-01 23:34:04 -0500 (Wed, 01 Apr 2009) | 6 lines
Clarify that datetime strftime does not produce leap seconds and datetime
strptime does not accept it in the strftime behavior section of the
datetime docs.
Closes issue 2568.
........
r71056 | georg.brandl | 2009-04-02 12:43:07 -0500 (Thu, 02 Apr 2009) | 2 lines
Actually the displayhook should print the repr.
........
r71094 | vinay.sajip | 2009-04-03 05:23:18 -0500 (Fri, 03 Apr 2009) | 1 line
Added warning about logging use from asynchronous signal handlers.
........
r71101 | andrew.kuchling | 2009-04-03 16:43:00 -0500 (Fri, 03 Apr 2009) | 1 line
Add some items
........
r71102 | andrew.kuchling | 2009-04-03 16:44:49 -0500 (Fri, 03 Apr 2009) | 1 line
Fix 'the the'; grammar fix
........
r71103 | andrew.kuchling | 2009-04-03 16:45:29 -0500 (Fri, 03 Apr 2009) | 1 line
Fix 'the the' duplication
........
r71106 | vinay.sajip | 2009-04-03 16:58:16 -0500 (Fri, 03 Apr 2009) | 1 line
Clarified warning about logging use from asynchronous signal handlers.
........
r71119 | raymond.hettinger | 2009-04-04 00:37:47 -0500 (Sat, 04 Apr 2009) | 1 line
Add helpful link.
........
r71123 | r.david.murray | 2009-04-04 01:39:56 -0500 (Sat, 04 Apr 2009) | 2 lines
Fix error in description of 'oct' (issue 5678).
........
r71149 | georg.brandl | 2009-04-04 08:42:39 -0500 (Sat, 04 Apr 2009) | 1 line
#5642: clarify map() compatibility to the builtin.
........
r71150 | georg.brandl | 2009-04-04 08:45:49 -0500 (Sat, 04 Apr 2009) | 1 line
#5601: clarify that webbrowser is not meant for file names.
........
r71203 | benjamin.peterson | 2009-04-04 18:46:34 -0500 (Sat, 04 Apr 2009) | 1 line
note how using iter* are unsafe while mutating and document iter(dict)
........
r71212 | georg.brandl | 2009-04-05 05:24:20 -0500 (Sun, 05 Apr 2009) | 1 line
#1742837: expand HTTP server docs, and fix SocketServer ones to document methods as methods, not functions.
........
r71214 | georg.brandl | 2009-04-05 05:29:57 -0500 (Sun, 05 Apr 2009) | 1 line
Normalize spelling of Mac OS X.
........
r71215 | georg.brandl | 2009-04-05 05:32:26 -0500 (Sun, 05 Apr 2009) | 1 line
Avoid sure signs of a diseased mind.
........
r71216 | georg.brandl | 2009-04-05 05:41:02 -0500 (Sun, 05 Apr 2009) | 1 line
#1718017: document the relation of os.path and the posixpath, ntpath etc. modules better.
........
r71217 | georg.brandl | 2009-04-05 05:48:47 -0500 (Sun, 05 Apr 2009) | 1 line
#1726172: dont raise an unexpected IndexError if a voidresp() call has an empty response.
........
r71221 | vinay.sajip | 2009-04-05 06:06:24 -0500 (Sun, 05 Apr 2009) | 1 line
Issue #5695: Moved logging.captureWarnings() call inside with statement in WarningsTest.test_warnings.
........
r71240 | georg.brandl | 2009-04-05 09:40:06 -0500 (Sun, 05 Apr 2009) | 1 line
#5370: doc update about unpickling objects with custom __getattr__ etc. methods.
........
................
r71262 | benjamin.peterson | 2009-04-05 15:15:51 -0400 (Sun, 05 Apr 2009) | 8 lines
Blocked revisions 71253 via svnmerge
........
r71253 | tarek.ziade | 2009-04-05 13:31:24 -0500 (Sun, 05 Apr 2009) | 1 line
Fixed 5694: removed spurious test output in Distutils
........
................
r71267 | georg.brandl | 2009-04-05 16:24:29 -0400 (Sun, 05 Apr 2009) | 1 line
Normalize issue referencing style.
................
r71274 | benjamin.peterson | 2009-04-05 17:24:58 -0400 (Sun, 05 Apr 2009) | 25 lines
Merged revisions 70908,70939,71009,71022,71036 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70908 | jesse.noller | 2009-03-31 17:20:35 -0500 (Tue, 31 Mar 2009) | 1 line
Issue 5619: Pass MS CRT debug flags into subprocesses
........
r70939 | jesse.noller | 2009-03-31 22:45:50 -0500 (Tue, 31 Mar 2009) | 1 line
Fix multiprocessing.event to match the new threading.Event API
........
r71009 | jesse.noller | 2009-04-01 19:03:28 -0500 (Wed, 01 Apr 2009) | 1 line
issue5545: Switch to Autoconf for multiprocessing; special thanks to Martin Lowis for help
........
r71022 | jesse.noller | 2009-04-01 21:32:55 -0500 (Wed, 01 Apr 2009) | 1 line
Issue 3110: Additional protection for SEM_VALUE_MAX on platforms, thanks to Martin Loewis
........
r71036 | jesse.noller | 2009-04-01 23:22:09 -0500 (Wed, 01 Apr 2009) | 1 line
Issue 3551: Raise ValueError if the size causes ERROR_NO_SYSTEM_RESOURCES
........
................
Removed:
python/branches/py3k-short-float-repr/Lib/test/README
Modified:
python/branches/py3k-short-float-repr/ (props changed)
python/branches/py3k-short-float-repr/Doc/c-api/init.rst
python/branches/py3k-short-float-repr/Doc/c-api/number.rst
python/branches/py3k-short-float-repr/Doc/c-api/object.rst
python/branches/py3k-short-float-repr/Doc/c-api/structures.rst
python/branches/py3k-short-float-repr/Doc/c-api/veryhigh.rst
python/branches/py3k-short-float-repr/Doc/distutils/apiref.rst
python/branches/py3k-short-float-repr/Doc/extending/extending.rst
python/branches/py3k-short-float-repr/Doc/howto/cporting.rst
python/branches/py3k-short-float-repr/Doc/library/abc.rst
python/branches/py3k-short-float-repr/Doc/library/doctest.rst
python/branches/py3k-short-float-repr/Doc/library/functions.rst
python/branches/py3k-short-float-repr/Doc/library/itertools.rst
python/branches/py3k-short-float-repr/Doc/library/logging.rst
python/branches/py3k-short-float-repr/Doc/library/multiprocessing.rst
python/branches/py3k-short-float-repr/Doc/library/os.path.rst
python/branches/py3k-short-float-repr/Doc/library/os.rst
python/branches/py3k-short-float-repr/Doc/library/pdb.rst
python/branches/py3k-short-float-repr/Doc/library/pickle.rst
python/branches/py3k-short-float-repr/Doc/library/re.rst
python/branches/py3k-short-float-repr/Doc/library/shelve.rst
python/branches/py3k-short-float-repr/Doc/library/socketserver.rst
python/branches/py3k-short-float-repr/Doc/library/ssl.rst
python/branches/py3k-short-float-repr/Doc/library/stdtypes.rst
python/branches/py3k-short-float-repr/Doc/library/sys.rst
python/branches/py3k-short-float-repr/Doc/library/threading.rst
python/branches/py3k-short-float-repr/Doc/library/tkinter.ttk.rst
python/branches/py3k-short-float-repr/Doc/library/urllib.request.rst
python/branches/py3k-short-float-repr/Doc/library/webbrowser.rst
python/branches/py3k-short-float-repr/Doc/library/winreg.rst
python/branches/py3k-short-float-repr/Doc/reference/datamodel.rst
python/branches/py3k-short-float-repr/Doc/tutorial/datastructures.rst
python/branches/py3k-short-float-repr/Doc/tutorial/introduction.rst
python/branches/py3k-short-float-repr/Doc/whatsnew/2.6.rst
python/branches/py3k-short-float-repr/Doc/whatsnew/2.7.rst
python/branches/py3k-short-float-repr/Include/patchlevel.h
python/branches/py3k-short-float-repr/Lib/distutils/cmd.py
python/branches/py3k-short-float-repr/Lib/distutils/log.py
python/branches/py3k-short-float-repr/Lib/distutils/tests/test_clean.py
python/branches/py3k-short-float-repr/Lib/ftplib.py
python/branches/py3k-short-float-repr/Lib/glob.py
python/branches/py3k-short-float-repr/Lib/multiprocessing/synchronize.py
python/branches/py3k-short-float-repr/Lib/optparse.py
python/branches/py3k-short-float-repr/Lib/pdb.py
python/branches/py3k-short-float-repr/Lib/pydoc.py
python/branches/py3k-short-float-repr/Lib/test/test_logging.py
python/branches/py3k-short-float-repr/Lib/test/test_multiprocessing.py
python/branches/py3k-short-float-repr/Lib/test/test_pprint.py
python/branches/py3k-short-float-repr/Lib/test/test_sys.py
python/branches/py3k-short-float-repr/Lib/test/test_threading.py
python/branches/py3k-short-float-repr/Lib/test/test_traceback.py
python/branches/py3k-short-float-repr/Lib/threading.py
python/branches/py3k-short-float-repr/Lib/traceback.py
python/branches/py3k-short-float-repr/Makefile.pre.in
python/branches/py3k-short-float-repr/Misc/ACKS
python/branches/py3k-short-float-repr/Misc/NEWS
python/branches/py3k-short-float-repr/Misc/developers.txt
python/branches/py3k-short-float-repr/Modules/_io/_iomodule.c
python/branches/py3k-short-float-repr/Modules/_io/bufferedio.c
python/branches/py3k-short-float-repr/Modules/_multiprocessing/connection.h
python/branches/py3k-short-float-repr/Modules/_multiprocessing/multiprocessing.c
python/branches/py3k-short-float-repr/Modules/_multiprocessing/multiprocessing.h
python/branches/py3k-short-float-repr/Modules/_multiprocessing/pipe_connection.c
python/branches/py3k-short-float-repr/Modules/_multiprocessing/semaphore.c
python/branches/py3k-short-float-repr/Modules/_sqlite/connection.c
python/branches/py3k-short-float-repr/Modules/_sqlite/module.c
python/branches/py3k-short-float-repr/Modules/_tkinter.c
python/branches/py3k-short-float-repr/Objects/genobject.c
python/branches/py3k-short-float-repr/Objects/object.c
python/branches/py3k-short-float-repr/configure
python/branches/py3k-short-float-repr/configure.in
python/branches/py3k-short-float-repr/pyconfig.h.in
python/branches/py3k-short-float-repr/setup.py
Modified: python/branches/py3k-short-float-repr/Doc/c-api/init.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/c-api/init.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/c-api/init.rst Mon Apr 6 00:11:42 2009
@@ -787,7 +787,7 @@
Asynchronous Notifications
==========================
-A mechanism is provided to make asynchronous notifications to the the main
+A mechanism is provided to make asynchronous notifications to the main
interpreter thread. These notifications take the form of a function
pointer and a void argument.
Modified: python/branches/py3k-short-float-repr/Doc/c-api/number.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/c-api/number.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/c-api/number.rst Mon Apr 6 00:11:42 2009
@@ -264,8 +264,8 @@
.. cfunction:: PyObject* PyNumber_ToBase(PyObject *n, int base)
- Returns the the integer *n* converted to *base* as a string with a base
- marker of ``'0b'``, ``'0o'``, or ``'0x'`` if appended applicable. When
+ Returns the integer *n* converted to *base* as a string with a base
+ marker of ``'0b'``, ``'0o'``, or ``'0x'`` if applicable. When
*base* is not 2, 8, 10, or 16, the format is ``'x#num'`` where x is the
base. If *n* is not an int object, it is converted with
:cfunc:`PyNumber_Index` first.
Modified: python/branches/py3k-short-float-repr/Doc/c-api/object.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/c-api/object.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/c-api/object.rst Mon Apr 6 00:11:42 2009
@@ -42,6 +42,16 @@
expression ``o.attr_name``.
+.. cfunction:: PyObject* PyObject_GenericGetAttr(PyObject *o, PyObject *name)
+
+ Generic attribute getter function that is meant to be put into a type
+ object's ``tp_getattro`` slot. It looks for a descriptor in the dictionary
+ of classes in the object's MRO as well as an attribute in the object's
+ :attr:`__dict__` (if present). As outlined in :ref:`descriptors`, data
+ descriptors take preference over instance attributes, while non-data
+ descriptors don't. Otherwise, an :exc:`AttributeError` is raised.
+
+
.. cfunction:: int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v)
Set the value of the attribute named *attr_name*, for object *o*, to the value
@@ -56,6 +66,16 @@
``o.attr_name = v``.
+.. cfunction:: int PyObject_GenericSetAttr(PyObject *o, PyObject *name, PyObject *value)
+
+ Generic attribute setter function that is meant to be put into a type
+ object's ``tp_setattro`` slot. It looks for a data descriptor in the
+ dictionary of classes in the object's MRO, and if found it takes preference
+ over setting the attribute in the instance dictionary. Otherwise, the
+ attribute is set in the object's :attr:`__dict__` (if present). Otherwise,
+ an :exc:`AttributeError` is raised and ``-1`` is returned.
+
+
.. cfunction:: int PyObject_DelAttr(PyObject *o, PyObject *attr_name)
Delete attribute named *attr_name*, for object *o*. Returns ``-1`` on failure.
Modified: python/branches/py3k-short-float-repr/Doc/c-api/structures.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/c-api/structures.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/c-api/structures.rst Mon Apr 6 00:11:42 2009
@@ -241,7 +241,7 @@
T_OBJECT_EX PyObject \*
T_CHAR char
T_BYTE char
- T_UNBYTE unsigned char
+ T_UBYTE unsigned char
T_UINT unsigned int
T_USHORT unsigned short
T_ULONG unsigned long
Modified: python/branches/py3k-short-float-repr/Doc/c-api/veryhigh.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/c-api/veryhigh.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/c-api/veryhigh.rst Mon Apr 6 00:11:42 2009
@@ -38,6 +38,10 @@
interpreter exits due to an exception, or ``2`` if the parameter
list does not represent a valid Python command line.
+ Note that if an otherwise unhandled :exc:`SystemError` is raised, this
+ function will not return ``1``, but exit the process, as long as
+ ``Py_InspectFlag`` is not set.
+
.. cfunction:: int PyRun_AnyFile(FILE *fp, const char *filename)
@@ -80,6 +84,10 @@
there was an error, there is no way to get the exception information. For the
meaning of *flags*, see below.
+ Note that if an otherwise unhandled :exc:`SystemError` is raised, this
+ function will not return ``-1``, but exit the process, as long as
+ ``Py_InspectFlag`` is not set.
+
.. cfunction:: int PyRun_SimpleFile(FILE *fp, const char *filename)
Modified: python/branches/py3k-short-float-repr/Doc/distutils/apiref.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/distutils/apiref.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/distutils/apiref.rst Mon Apr 6 00:11:42 2009
@@ -1050,8 +1050,8 @@
.. warning::
- Handles cross-device moves on Unix using :func:`copy_file`. What about other
- systems???
+ Handles cross-device moves on Unix using :func:`copy_file`. What about
+ other systems?
.. function:: write_file(filename, contents)
@@ -1091,17 +1091,17 @@
For non-POSIX platforms, currently just returns ``sys.platform``.
- For MacOS X systems the OS version reflects the minimal version on which
+ For Mac OS X systems the OS version reflects the minimal version on which
binaries will run (that is, the value of ``MACOSX_DEPLOYMENT_TARGET``
during the build of Python), not the OS version of the current system.
- For universal binary builds on MacOS X the architecture value reflects
+ For universal binary builds on Mac OS X the architecture value reflects
the univeral binary status instead of the architecture of the current
processor. For 32-bit universal binaries the architecture is ``fat``,
for 64-bit universal binaries the architecture is ``fat64``, and
for 4-way universal binaries the architecture is ``universal``.
- Examples of returned values on MacOS X:
+ Examples of returned values on Mac OS X:
* ``macosx-10.3-ppc``
@@ -1758,8 +1758,16 @@
.. module:: distutils.command.bdist_msi
:synopsis: Build a binary distribution as a Windows MSI file
+.. class:: bdist_msi(Command)
-.. % todo
+ Builds a `Windows Installer`_ (.msi) binary package.
+
+ .. _Windows Installer: http://msdn.microsoft.com/en-us/library/cc185688(VS.85).aspx
+
+ In most cases, the ``bdist_msi`` installer is a better choice than the
+ ``bdist_wininst`` installer, because it provides better support for
+ Win64 platforms, allows administrators to perform non-interactive
+ installations, and allows installation through group policies.
:mod:`distutils.command.bdist_rpm` --- Build a binary distribution as a Redhat RPM and SRPM
Modified: python/branches/py3k-short-float-repr/Doc/extending/extending.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/extending/extending.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/extending/extending.rst Mon Apr 6 00:11:42 2009
@@ -476,10 +476,10 @@
(but note that *temp* will not be *NULL* in this context). More info on them
in section :ref:`refcounts`.
-.. index:: single: PyEval_CallObject()
+.. index:: single: PyObject_CallObject()
Later, when it is time to call the function, you call the C function
-:cfunc:`PyEval_CallObject`. This function has two arguments, both pointers to
+:cfunc:`PyObject_CallObject`. This function has two arguments, both pointers to
arbitrary Python objects: the Python function, and the argument list. The
argument list must always be a tuple object, whose length is the number of
arguments. To call the Python function with no arguments, pass in NULL, or
@@ -495,16 +495,16 @@
...
/* Time to call the callback */
arglist = Py_BuildValue("(i)", arg);
- result = PyEval_CallObject(my_callback, arglist);
+ result = PyObject_CallObject(my_callback, arglist);
Py_DECREF(arglist);
-:cfunc:`PyEval_CallObject` returns a Python object pointer: this is the return
-value of the Python function. :cfunc:`PyEval_CallObject` is
+:cfunc:`PyObject_CallObject` returns a Python object pointer: this is the return
+value of the Python function. :cfunc:`PyObject_CallObject` is
"reference-count-neutral" with respect to its arguments. In the example a new
tuple was created to serve as the argument list, which is :cfunc:`Py_DECREF`\
-ed immediately after the call.
-The return value of :cfunc:`PyEval_CallObject` is "new": either it is a brand
+The return value of :cfunc:`PyObject_CallObject` is "new": either it is a brand
new object, or it is an existing object whose reference count has been
incremented. So, unless you want to save it in a global variable, you should
somehow :cfunc:`Py_DECREF` the result, even (especially!) if you are not
@@ -512,7 +512,7 @@
Before you do this, however, it is important to check that the return value
isn't *NULL*. If it is, the Python function terminated by raising an exception.
-If the C code that called :cfunc:`PyEval_CallObject` is called from Python, it
+If the C code that called :cfunc:`PyObject_CallObject` is called from Python, it
should now return an error indication to its Python caller, so the interpreter
can print a stack trace, or the calling Python code can handle the exception.
If this is not possible or desirable, the exception should be cleared by calling
@@ -524,7 +524,7 @@
Py_DECREF(result);
Depending on the desired interface to the Python callback function, you may also
-have to provide an argument list to :cfunc:`PyEval_CallObject`. In some cases
+have to provide an argument list to :cfunc:`PyObject_CallObject`. In some cases
the argument list is also provided by the Python program, through the same
interface that specified the callback function. It can then be saved and used
in the same manner as the function object. In other cases, you may have to
@@ -535,7 +535,7 @@
PyObject *arglist;
...
arglist = Py_BuildValue("(l)", eventcode);
- result = PyEval_CallObject(my_callback, arglist);
+ result = PyObject_CallObject(my_callback, arglist);
Py_DECREF(arglist);
if (result == NULL)
return NULL; /* Pass error back */
@@ -547,19 +547,20 @@
:cfunc:`Py_BuildValue` may run out of memory, and this should be checked.
You may also call a function with keyword arguments by using
-:cfunc:`PyEval_CallObjectWithKeywords`. As in the above example, we use
-:cfunc:`Py_BuildValue` to construct the dictionary. ::
+:cfunc:`PyObject_Call`, which supports arguments and keyword arguments. As in
+the above example, we use :cfunc:`Py_BuildValue` to construct the dictionary. ::
PyObject *dict;
...
dict = Py_BuildValue("{s:i}", "name", val);
- result = PyEval_CallObjectWithKeywords(my_callback, NULL, dict);
+ result = PyObject_Call(my_callback, NULL, dict);
Py_DECREF(dict);
if (result == NULL)
return NULL; /* Pass error back */
/* Here maybe use the result */
Py_DECREF(result);
+
.. _parsetuple:
Extracting Parameters in Extension Functions
Modified: python/branches/py3k-short-float-repr/Doc/howto/cporting.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/howto/cporting.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/howto/cporting.rst Mon Apr 6 00:11:42 2009
@@ -98,7 +98,7 @@
Python level, but actually corresponds to 2.x's :func:`long` type. In the
C-API, ``PyInt_*`` functions are replaced by their ``PyLong_*`` neighbors. The
best course of action here is using the ``PyInt_*`` functions aliased to
-``PyLong_*`` found in :file:`intobject.h`. The the abstract ``PyNumber_*`` APIs
+``PyLong_*`` found in :file:`intobject.h`. The abstract ``PyNumber_*`` APIs
can also be used in some cases. ::
#include "Python.h"
Modified: python/branches/py3k-short-float-repr/Doc/library/abc.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/abc.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/abc.rst Mon Apr 6 00:11:42 2009
@@ -132,7 +132,7 @@
A class that has a metaclass derived from :class:`ABCMeta`
cannot be instantiated unless all of its abstract methods and
properties are overridden.
- The abstract methods can be called using any of the the normal 'super' call
+ The abstract methods can be called using any of the normal 'super' call
mechanisms.
Dynamically adding abstract methods to a class, or attempting to modify the
@@ -184,6 +184,7 @@
def setx(self, value): ...
x = abstractproperty(getx, setx)
+
.. rubric:: Footnotes
.. [#] C++ programmers should note that Python's virtual base class
Modified: python/branches/py3k-short-float-repr/Doc/library/doctest.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/doctest.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/doctest.rst Mon Apr 6 00:11:42 2009
@@ -905,7 +905,7 @@
from text files and modules with doctests:
-.. function:: DocFileSuite([module_relative][, package][, setUp][, tearDown][, globs][, optionflags][, parser][, encoding])
+.. function:: DocFileSuite(*paths, [module_relative][, package][, setUp][, tearDown][, globs][, optionflags][, parser][, encoding])
Convert doctest tests from one or more text files to a
:class:`unittest.TestSuite`.
@@ -923,45 +923,47 @@
Optional argument *module_relative* specifies how the filenames in *paths*
should be interpreted:
- * If *module_relative* is ``True`` (the default), then each filename specifies
- an OS-independent module-relative path. By default, this path is relative to
- the calling module's directory; but if the *package* argument is specified, then
- it is relative to that package. To ensure OS-independence, each filename should
- use ``/`` characters to separate path segments, and may not be an absolute path
- (i.e., it may not begin with ``/``).
-
- * If *module_relative* is ``False``, then each filename specifies an OS-specific
- path. The path may be absolute or relative; relative paths are resolved with
- respect to the current working directory.
-
- Optional argument *package* is a Python package or the name of a Python package
- whose directory should be used as the base directory for module-relative
- filenames. If no package is specified, then the calling module's directory is
- used as the base directory for module-relative filenames. It is an error to
- specify *package* if *module_relative* is ``False``.
-
- Optional argument *setUp* specifies a set-up function for the test suite. This
- is called before running the tests in each file. The *setUp* function will be
- passed a :class:`DocTest` object. The setUp function can access the test
- globals as the *globs* attribute of the test passed.
+ * If *module_relative* is ``True`` (the default), then each filename in
+ *paths* specifies an OS-independent module-relative path. By default, this
+ path is relative to the calling module's directory; but if the *package*
+ argument is specified, then it is relative to that package. To ensure
+ OS-independence, each filename should use ``/`` characters to separate path
+ segments, and may not be an absolute path (i.e., it may not begin with
+ ``/``).
+
+ * If *module_relative* is ``False``, then each filename in *paths* specifies
+ an OS-specific path. The path may be absolute or relative; relative paths
+ are resolved with respect to the current working directory.
+
+ Optional argument *package* is a Python package or the name of a Python
+ package whose directory should be used as the base directory for
+ module-relative filenames in *paths*. If no package is specified, then the
+ calling module's directory is used as the base directory for module-relative
+ filenames. It is an error to specify *package* if *module_relative* is
+ ``False``.
- Optional argument *tearDown* specifies a tear-down function for the test suite.
- This is called after running the tests in each file. The *tearDown* function
+ Optional argument *setUp* specifies a set-up function for the test suite.
+ This is called before running the tests in each file. The *setUp* function
will be passed a :class:`DocTest` object. The setUp function can access the
test globals as the *globs* attribute of the test passed.
+ Optional argument *tearDown* specifies a tear-down function for the test
+ suite. This is called after running the tests in each file. The *tearDown*
+ function will be passed a :class:`DocTest` object. The setUp function can
+ access the test globals as the *globs* attribute of the test passed.
+
Optional argument *globs* is a dictionary containing the initial global
variables for the tests. A new copy of this dictionary is created for each
test. By default, *globs* is a new empty dictionary.
Optional argument *optionflags* specifies the default doctest options for the
tests, created by or-ing together individual option flags. See section
- :ref:`doctest-options`. See function :func:`set_unittest_reportflags` below for
- a better way to set reporting options.
+ :ref:`doctest-options`. See function :func:`set_unittest_reportflags` below
+ for a better way to set reporting options.
- Optional argument *parser* specifies a :class:`DocTestParser` (or subclass) that
- should be used to extract tests from the files. It defaults to a normal parser
- (i.e., ``DocTestParser()``).
+ Optional argument *parser* specifies a :class:`DocTestParser` (or subclass)
+ that should be used to extract tests from the files. It defaults to a normal
+ parser (i.e., ``DocTestParser()``).
Optional argument *encoding* specifies an encoding that should be used to
convert the file to unicode.
Modified: python/branches/py3k-short-float-repr/Doc/library/functions.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/functions.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/functions.rst Mon Apr 6 00:11:42 2009
@@ -1163,9 +1163,11 @@
Without arguments, return a dictionary corresponding to the current local symbol
table. With a module, class or class instance object as argument (or anything
else that has a :attr:`__dict__` attribute), returns a dictionary corresponding
- to the object's symbol table. The returned dictionary should not be modified:
- the effects on the corresponding symbol table are undefined. [#]_
+ to the object's symbol table.
+ .. warning::
+ The returned dictionary should not be modified:
+ the effects on the corresponding symbol table are undefined. [#]_
.. function:: zip(*iterables)
Modified: python/branches/py3k-short-float-repr/Doc/library/itertools.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/itertools.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/itertools.rst Mon Apr 6 00:11:42 2009
@@ -207,7 +207,7 @@
Make an iterator that filters elements from *data* returning only those that
have a corresponding element in *selectors* that evaluates to ``True``.
- Stops when either the *data* or *selectors* iterables have been exhausted.
+ Stops when either the *data* or *selectors* iterables has been exhausted.
Equivalent to::
def compress(data, selectors):
Modified: python/branches/py3k-short-float-repr/Doc/library/logging.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/logging.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/logging.rst Mon Apr 6 00:11:42 2009
@@ -2290,6 +2290,10 @@
locks; there is one lock to serialize access to the module's shared data, and
each handler also creates a lock to serialize access to its underlying I/O.
+If you are implementing asynchronous signal handlers using the :mod:`signal`
+module, you may not be able to use logging from within such handlers. This is
+because lock implementations in the :mod:`threading` module are not always
+re-entrant, and so cannot be invoked from such signal handlers.
Configuration
-------------
Modified: python/branches/py3k-short-float-repr/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/multiprocessing.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/multiprocessing.rst Mon Apr 6 00:11:42 2009
@@ -708,7 +708,8 @@
Send an object to the other end of the connection which should be read
using :meth:`recv`.
- The object must be picklable.
+ The object must be picklable. Very large pickles (approximately 32 MB+,
+ though it depends on the OS) may raise a ValueError exception.
.. method:: recv()
@@ -740,7 +741,9 @@
complete message.
If *offset* is given then data is read from that position in *buffer*. If
- *size* is given then that many bytes will be read from buffer.
+ *size* is given then that many bytes will be read from buffer. Very large
+ buffers (approximately 32 MB+, though it depends on the OS) may raise a
+ ValueError exception
.. method:: recv_bytes([maxlength])
@@ -834,6 +837,12 @@
.. class:: Event()
A clone of :class:`threading.Event`.
+ This method returns the state of the internal semaphore on exit, so it
+ will always return ``True`` except if a timeout is given and the operation
+ times out.
+
+ .. versionchanged:: 2.7
+ Previously, the method always returned ``None``.
.. class:: Lock()
@@ -1537,8 +1546,8 @@
.. method:: map(func, iterable[, chunksize])
- A parallel equivalent of the :func:`map` builtin function, collecting the
- result in a list. It blocks till the whole result is ready.
+ A parallel equivalent of the :func:`map` builtin function (it supports only
+ one *iterable* argument though). It blocks till the result is ready.
This method chops the iterable into a number of chunks which it submits to
the process pool as separate tasks. The (approximate) size of these
@@ -1697,6 +1706,12 @@
*address* is the address to be used by the bound socket or named pipe of the
listener object.
+ .. note::
+
+ If an address of '0.0.0.0' is used, the address will not be a connectable
+ end point on Windows. If you require a connectable end-point,
+ you should use '127.0.0.1'.
+
*family* is the type of socket (or named pipe) to use. This can be one of
the strings ``'AF_INET'`` (for a TCP socket), ``'AF_UNIX'`` (for a Unix
domain socket) or ``'AF_PIPE'`` (for a Windows named pipe). Of these only
@@ -1839,7 +1854,7 @@
any :class:`~multiprocessing.Process` object that the current process creates.
This means that (by default) all processes of a multi-process program will share
a single authentication key which can be used when setting up connections
-between the themselves.
+between themselves.
Suitable authentication keys can also be generated by using :func:`os.urandom`.
Modified: python/branches/py3k-short-float-repr/Doc/library/os.path.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/os.path.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/os.path.rst Mon Apr 6 00:11:42 2009
@@ -1,11 +1,9 @@
-
:mod:`os.path` --- Common pathname manipulations
================================================
.. module:: os.path
:synopsis: Operations on pathnames.
-
.. index:: single: path; operations
This module implements some useful functions on pathnames. To read or
@@ -31,6 +29,22 @@
:func:`splitunc` and :func:`ismount` do handle them correctly.
+.. note::
+
+ Since different operating systems have different path name conventions, there
+ are several versions of this module in the standard library. The
+ :mod:`os.path` module is always the path module suitable for the operating
+ system Python is running on, and therefore usable for local paths. However,
+ you can also import and use the individual modules if you want to manipulate
+ a path that is *always* in one of the different formats. They all have the
+ same interface:
+
+ * :mod:`posixpath` for UNIX-style paths
+ * :mod:`ntpath` for Windows paths
+ * :mod:`macpath` for old-style MacOS paths
+ * :mod:`os2emxpath` for OS/2 EMX paths
+
+
.. function:: abspath(path)
Return a normalized absolutized version of the pathname *path*. On most
@@ -189,9 +203,9 @@
.. function:: normcase(path)
- Normalize the case of a pathname. On Unix and MacOSX, this returns the path unchanged; on
- case-insensitive filesystems, it converts the path to lowercase. On Windows, it
- also converts forward slashes to backward slashes.
+ Normalize the case of a pathname. On Unix and Mac OS X, this returns the
+ path unchanged; on case-insensitive filesystems, it converts the path to
+ lowercase. On Windows, it also converts forward slashes to backward slashes.
.. function:: normpath(path)
Modified: python/branches/py3k-short-float-repr/Doc/library/os.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/os.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/os.rst Mon Apr 6 00:11:42 2009
@@ -51,15 +51,6 @@
``'ce'``, ``'java'``.
-.. data:: path
-
- The corresponding operating system dependent standard module for pathname
- operations, such as :mod:`posixpath` or :mod:`ntpath`. Thus, given the proper
- imports, ``os.path.split(file)`` is equivalent to but more portable than
- ``posixpath.split(file)``. Note that this is also an importable module: it may
- be imported directly as :mod:`os.path`.
-
-
.. _os-procinfo:
Process Parameters
@@ -1491,7 +1482,9 @@
which is used to define the environment variables for the new process (they are
used instead of the current process' environment); the functions
:func:`spawnl`, :func:`spawnlp`, :func:`spawnv`, and :func:`spawnvp` all cause
- the new process to inherit the environment of the current process.
+ the new process to inherit the environment of the current process. Note that
+ keys and values in the *env* dictionary must be strings; invalid keys or
+ values will cause the function to fail, with a return value of ``127``.
As an example, the following calls to :func:`spawnlp` and :func:`spawnvpe` are
equivalent::
Modified: python/branches/py3k-short-float-repr/Doc/library/pdb.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/pdb.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/pdb.rst Mon Apr 6 00:11:42 2009
@@ -262,7 +262,7 @@
full speed, only stopping at the next line in the current function.)
unt(il)
- Continue execution until the line with the the line number greater than the
+ Continue execution until the line with the line number greater than the
current one is reached or when returning from current frame.
r(eturn)
Modified: python/branches/py3k-short-float-repr/Doc/library/pickle.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/pickle.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/pickle.rst Mon Apr 6 00:11:42 2009
@@ -436,6 +436,14 @@
Refer to the section :ref:`pickle-state` for more information about how to use
the methods :meth:`__getstate__` and :meth:`__setstate__`.
+.. note::
+ At unpickling time, some methods like :meth:`__getattr__`,
+ :meth:`__getattribute__`, or :meth:`__setattr__` may be called upon the
+ instance. In case those methods rely on some internal invariant being
+ true, the type should implement either :meth:`__getinitargs__` or
+ :meth:`__getnewargs__` to establish such an invariant; otherwise, neither
+ :meth:`__new__` nor :meth:`__init__` will be called.
+
.. index::
pair: copy; protocol
single: __reduce__() (copy protocol)
Modified: python/branches/py3k-short-float-repr/Doc/library/re.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/re.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/re.rst Mon Apr 6 00:11:42 2009
@@ -8,10 +8,9 @@
.. sectionauthor:: Andrew M. Kuchling <amk at amk.ca>
-
-
This module provides regular expression matching operations similar to
-those found in Perl. The :mod:`re` module is always available.
+those found in Perl. Both patterns and strings to be searched can be
+Unicode strings as well as 8-bit strings.
Both patterns and strings to be searched can be Unicode strings as well as
8-bit strings. However, Unicode strings and 8-bit strings cannot be mixed:
@@ -47,9 +46,6 @@
second edition of the book no longer covers Python at all, but the first
edition covered writing good regular expression patterns in great detail.
- `Kodos <http://kodos.sf.net/>`_
- is a graphical regular expression debugger written in Python.
-
.. _re-syntax:
@@ -241,16 +237,18 @@
``(?P<name>...)``
Similar to regular parentheses, but the substring matched by the group is
- accessible via the symbolic group name *name*. Group names must be valid Python
- identifiers, and each group name must be defined only once within a regular
- expression. A symbolic group is also a numbered group, just as if the group
- were not named. So the group named 'id' in the example below can also be
- referenced as the numbered group 1.
+ accessible within the rest of the regular expression via the symbolic group
+ name *name*. Group names must be valid Python identifiers, and each group
+ name must be defined only once within a regular expression. A symbolic group
+ is also a numbered group, just as if the group were not named. So the group
+ named ``id`` in the example below can also be referenced as the numbered group
+ ``1``.
For example, if the pattern is ``(?P<id>[a-zA-Z_]\w*)``, the group can be
referenced by its name in arguments to methods of match objects, such as
- ``m.group('id')`` or ``m.end('id')``, and also by name in pattern text (for
- example, ``(?P=id)``) and replacement text (such as ``\g<id>``).
+ ``m.group('id')`` or ``m.end('id')``, and also by name in the regular
+ expression itself (using ``(?P=id)``) and replacement text given to
+ ``.sub()`` (using ``\g<id>``).
``(?P=name)``
Matches whatever text was matched by the earlier group named *name*.
Modified: python/branches/py3k-short-float-repr/Doc/library/shelve.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/shelve.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/shelve.rst Mon Apr 6 00:11:42 2009
@@ -141,7 +141,7 @@
# as d was opened WITHOUT writeback=True, beware:
d['xx'] = range(4) # this works as expected, but...
- d['xx'].append(5) # *this doesn't!* -- d['xx'] is STILL range(4)!!!
+ d['xx'].append(5) # *this doesn't!* -- d['xx'] is STILL range(4)!
# having opened d without writeback=True, you need to code carefully:
temp = d['xx'] # extracts the copy
Modified: python/branches/py3k-short-float-repr/Doc/library/socketserver.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/socketserver.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/socketserver.rst Mon Apr 6 00:11:42 2009
@@ -122,15 +122,21 @@
Server Objects
--------------
+.. class:: BaseServer
-.. function:: fileno()
+ This is the superclass of all Server objects in the module. It defines the
+ interface, given below, but does not implement most of the methods, which is
+ done in subclasses.
+
+
+.. method:: BaseServer.fileno()
Return an integer file descriptor for the socket on which the server is
listening. This function is most commonly passed to :func:`select.select`, to
allow monitoring multiple servers in the same process.
-.. function:: handle_request()
+.. method:: BaseServer.handle_request()
Process a single request. This function calls the following methods in
order: :meth:`get_request`, :meth:`verify_request`, and
@@ -141,30 +147,30 @@
will return.
-.. function:: serve_forever(poll_interval=0.5)
+.. method:: BaseServer.serve_forever(poll_interval=0.5)
Handle requests until an explicit :meth:`shutdown` request. Polls for
shutdown every *poll_interval* seconds.
-.. function:: shutdown()
+.. method:: BaseServer.shutdown()
Tells the :meth:`serve_forever` loop to stop and waits until it does.
-.. data:: address_family
+.. attribute:: BaseServer.address_family
The family of protocols to which the server's socket belongs.
Common examples are :const:`socket.AF_INET` and :const:`socket.AF_UNIX`.
-.. data:: RequestHandlerClass
+.. attribute:: BaseServer.RequestHandlerClass
The user-provided request handler class; an instance of this class is created
for each request.
-.. data:: server_address
+.. attribute:: BaseServer.server_address
The address on which the server is listening. The format of addresses varies
depending on the protocol family; see the documentation for the socket module
@@ -172,22 +178,22 @@
the address, and an integer port number: ``('127.0.0.1', 80)``, for example.
-.. data:: socket
+.. attribute:: BaseServer.socket
The socket object on which the server will listen for incoming requests.
+
The server classes support the following class variables:
.. XXX should class variables be covered before instance variables, or vice versa?
-
-.. data:: allow_reuse_address
+.. attribute:: BaseServer.allow_reuse_address
Whether the server will allow the reuse of an address. This defaults to
:const:`False`, and can be set in subclasses to change the policy.
-.. data:: request_queue_size
+.. attribute:: BaseServer.request_queue_size
The size of the request queue. If it takes a long time to process a single
request, any requests that arrive while the server is busy are placed into a
@@ -196,17 +202,19 @@
value is usually 5, but this can be overridden by subclasses.
-.. data:: socket_type
+.. attribute:: BaseServer.socket_type
The type of socket used by the server; :const:`socket.SOCK_STREAM` and
:const:`socket.SOCK_DGRAM` are two common values.
-.. data:: timeout
+
+.. attribute:: BaseServer.timeout
Timeout duration, measured in seconds, or :const:`None` if no timeout is
desired. If :meth:`handle_request` receives no incoming requests within the
timeout period, the :meth:`handle_timeout` method is called.
+
There are various server methods that can be overridden by subclasses of base
server classes like :class:`TCPServer`; these methods aren't useful to external
users of the server object.
@@ -214,27 +222,27 @@
.. XXX should the default implementations of these be documented, or should
it be assumed that the user will look at socketserver.py?
-
-.. function:: finish_request()
+.. method:: BaseServer.finish_request()
Actually processes the request by instantiating :attr:`RequestHandlerClass` and
calling its :meth:`handle` method.
-.. function:: get_request()
+.. method:: BaseServer.get_request()
Must accept a request from the socket, and return a 2-tuple containing the *new*
socket object to be used to communicate with the client, and the client's
address.
-.. function:: handle_error(request, client_address)
+.. method:: BaseServer.handle_error(request, client_address)
This function is called if the :attr:`RequestHandlerClass`'s :meth:`handle`
method raises an exception. The default action is to print the traceback to
standard output and continue handling further requests.
-.. function:: handle_timeout()
+
+.. method:: BaseServer.handle_timeout()
This function is called when the :attr:`timeout` attribute has been set to a
value other than :const:`None` and the timeout period has passed with no
@@ -242,31 +250,32 @@
to collect the status of any child processes that have exited, while
in threading servers this method does nothing.
-.. function:: process_request(request, client_address)
+
+.. method:: BaseServer.process_request(request, client_address)
Calls :meth:`finish_request` to create an instance of the
:attr:`RequestHandlerClass`. If desired, this function can create a new process
or thread to handle the request; the :class:`ForkingMixIn` and
:class:`ThreadingMixIn` classes do this.
+
.. Is there any point in documenting the following two functions?
What would the purpose of overriding them be: initializing server
instance variables, adding new network families?
-
-.. function:: server_activate()
+.. method:: BaseServer.server_activate()
Called by the server's constructor to activate the server. The default behavior
just :meth:`listen`\ s to the server's socket. May be overridden.
-.. function:: server_bind()
+.. method:: BaseServer.server_bind()
Called by the server's constructor to bind the socket to the desired address.
May be overridden.
-.. function:: verify_request(request, client_address)
+.. method:: BaseServer.verify_request(request, client_address)
Must return a Boolean value; if the value is :const:`True`, the request will be
processed, and if it's :const:`False`, the request will be denied. This function
@@ -282,14 +291,14 @@
request.
-.. function:: finish()
+.. method:: RequestHandler.finish()
Called after the :meth:`handle` method to perform any clean-up actions
required. The default implementation does nothing. If :meth:`setup` or
:meth:`handle` raise an exception, this function will not be called.
-.. function:: handle()
+.. method:: RequestHandler.handle()
This function must do all the work required to service a request. The
default implementation does nothing. Several instance attributes are
@@ -308,7 +317,7 @@
data or return data to the client.
-.. function:: setup()
+.. method:: RequestHandler.setup()
Called before the :meth:`handle` method to perform any initialization actions
required. The default implementation does nothing.
Modified: python/branches/py3k-short-float-repr/Doc/library/ssl.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/ssl.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/ssl.rst Mon Apr 6 00:11:42 2009
@@ -293,7 +293,7 @@
If there is no certificate for the peer on the other end of the
connection, returns ``None``.
- If the the parameter ``binary_form`` is :const:`False`, and a
+ If the parameter ``binary_form`` is :const:`False`, and a
certificate was received from the peer, this method returns a
:class:`dict` instance. If the certificate was not validated, the
dict is empty. If the certificate was validated, it returns a dict
Modified: python/branches/py3k-short-float-repr/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/stdtypes.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/stdtypes.rst Mon Apr 6 00:11:42 2009
@@ -1834,6 +1834,11 @@
Equivalent to ``not key in d``.
+ .. describe:: iter(d)
+
+ Return an iterator over the keys of the dictionary. This is a shortcut
+ for :meth:`iterkeys`.
+
.. method:: clear()
Remove all items from the dictionary.
@@ -1931,6 +1936,9 @@
using :func:`zip`: ``pairs = zip(d.values(), d.keys())``. Another way to
create the same list is ``pairs = [(v, k) for (k, v) in d.items()]``.
+ Iterating views while adding or deleting entries in the dictionary will raise
+ a :exc:`RuntimeError`.
+
.. describe:: x in dictview
Return ``True`` if *x* is in the underlying dictionary's keys, values or
@@ -2666,10 +2674,26 @@
The name of the class or type.
+The following attributes are only supported by :term:`new-style class`\ es.
+
+.. attribute:: class.__mro__
+
+ This attribute is a tuple of classes that are considered when looking for
+ base classes during method resolution.
+
+
+.. method:: class.mro()
+
+ This method can be overridden by a metaclass to customize the method
+ resolution order for its instances. It is called at class instantiation, and
+ its result is stored in :attr:`__mro__`.
+
+
.. method:: class.__subclasses__
- All classes keep a list of weak references to their immediate subclasses.
- This method returns a list of all those references still alive. Example::
+ Each new-style class keeps a list of weak references to its immediate
+ subclasses. This method returns a list of all those references still alive.
+ Example::
>>> int.__subclasses__()
[<type 'bool'>]
Modified: python/branches/py3k-short-float-repr/Doc/library/sys.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/sys.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/sys.rst Mon Apr 6 00:11:42 2009
@@ -780,16 +780,20 @@
__stderr__
These objects contain the original values of ``stdin``, ``stderr`` and
- ``stdout`` at the start of the program. They are used during finalization, and
- could be useful to restore the actual files to known working file objects in
- case they have been overwritten with a broken object.
-
- .. note::
-
- Under some conditions ``stdin``, ``stdout`` and ``stderr`` as well as the
- original values ``__stdin__``, ``__stdout__`` and ``__stderr__`` can be
- None. It is usually the case for Windows GUI apps that aren't connected to
- a console and Python apps started with :program:`pythonw`.
+ ``stdout`` at the start of the program. They are used during finalization,
+ and could be useful to print to the actual standard stream no matter if the
+ ``sys.std*`` object has been redirected.
+
+ It can also be used to restore the actual files to known working file objects
+ in case they have been overwritten with a broken object. However, the
+ preferred way to do this is to explicitly save the previous stream before
+ replacing it, and restore the saved object.
+
+ .. note::
+ Under some conditions ``stdin``, ``stdout`` and ``stderr`` as well as the
+ original values ``__stdin__``, ``__stdout__`` and ``__stderr__`` can be
+ None. It is usually the case for Windows GUI apps that aren't connected
+ to a console and Python apps started with :program:`pythonw`.
.. data:: tracebacklimit
Modified: python/branches/py3k-short-float-repr/Doc/library/threading.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/threading.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/threading.rst Mon Apr 6 00:11:42 2009
@@ -676,14 +676,20 @@
.. method:: Event.wait([timeout])
- Block until the internal flag is true. If the internal flag is true on entry,
- return immediately. Otherwise, block until another thread calls :meth:`set` to
- set the flag to true, or until the optional timeout occurs.
+ Block until the internal flag is true. If the internal flag is true on entry,
+ return immediately. Otherwise, block until another thread calls :meth:`set`
+ to set the flag to true, or until the optional timeout occurs.
When the timeout argument is present and not ``None``, it should be a floating
point number specifying a timeout for the operation in seconds (or fractions
thereof).
+ This method returns the internal flag on exit, so it will always return
+ ``True`` except if a timeout is given and the operation times out.
+
+ .. versionchanged:: 2.7
+ Previously, the method always returned ``None``.
+
.. _timer-objects:
Modified: python/branches/py3k-short-float-repr/Doc/library/tkinter.ttk.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/tkinter.ttk.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/tkinter.ttk.rst Mon Apr 6 00:11:42 2009
@@ -249,7 +249,7 @@
ttk.Widget
^^^^^^^^^^
-Besides the methods described below, the class :class:`ttk.Widget` supports the
+Besides the methods described below, the :class:`ttk.Widget` supports the
methods :meth:`tkinter.Widget.cget` and :meth:`tkinter.Widget.configure`.
.. class:: Widget
@@ -484,7 +484,7 @@
The tab will not be displayed, but the associated window remains
managed by the notebook and its configuration remembered. Hidden tabs
- may be restored with the add command.
+ may be restored with the :meth:`add` command.
.. method:: identify(x, y)
@@ -503,7 +503,7 @@
Inserts a pane at the specified position.
- *pos* is either the string end, an integer index, or the name of a
+ *pos* is either the string "end", an integer index, or the name of a
managed child. If *child* is already managed by the notebook, moves it to
the specified position.
@@ -523,7 +523,7 @@
Query or modify the options of the specific *tab_id*.
- If *kw* is not given, returns a dict of the tab option values. If
+ If *kw* is not given, returns a dictionary of the tab option values. If
*option* is specified, returns the value of that *option*. Otherwise,
sets the options to the corresponding values.
@@ -540,14 +540,14 @@
This will extend the bindings for the toplevel window containing the
notebook as follows:
- * Control-Tab: selects the tab following the currently selected one
- * Shift-Control-Tab: selects the tab preceding the currently selected one
+ * Control-Tab: selects the tab following the currently selected one.
+ * Shift-Control-Tab: selects the tab preceding the currently selected one.
* Alt-K: where K is the mnemonic (underlined) character of any tab, will
select that tab.
Multiple notebooks in a single toplevel may be enabled for traversal,
including nested notebooks. However, notebook traversal only works
- properly if all panes have as master the notebook they are in.
+ properly if all panes have the notebook they are in as master.
Progressbar
@@ -580,12 +580,12 @@
+----------+---------------------------------------------------------------+
| value | The current value of the progress bar. In "determinate" mode, |
| | this represents the amount of work completed. In |
- | | "indeterminate" mode, it is interpreted as modulo maximum; |
+ | | "indeterminate" mode, it is interpreted as modulo *maximum*; |
| | that is, the progress bar completes one "cycle" when its value|
- | | increases by maximum. |
+ | | increases by *maximum*. |
+----------+---------------------------------------------------------------+
| variable | A name which is linked to the option value. If specified, the |
- | | value of the progressbar is automatically set to the value of |
+ | | value of the progress bar is automatically set to the value of|
| | this name whenever the latter is modified. |
+----------+---------------------------------------------------------------+
| phase | Read-only option. The widget periodically increments the value|
@@ -602,14 +602,14 @@
.. method:: start([interval])
- Begin autoincrement mode: schedules a recurring timer even that calls
+ Begin autoincrement mode: schedules a recurring timer event that calls
:meth:`Progressbar.step` every *interval* milliseconds. If omitted,
*interval* defaults to 50 milliseconds.
.. method:: step([amount])
- Increments progressbar's value by *amount*.
+ Increments the progress bar's value by *amount*.
*amount* defaults to 1.0 if omitted.
@@ -617,7 +617,7 @@
.. method:: stop()
Stop autoincrement mode: cancels any recurring timer event initiated by
- :meth:`Progressbar.start` for this progressbar.
+ :meth:`Progressbar.start` for this progress bar.
Separator
@@ -626,7 +626,7 @@
The :class:`ttk.Separator` widget displays a horizontal or vertical separator
bar.
-It has no other method besides the ones inherited from :class:`ttk.Widget`.
+It has no other methods besides the ones inherited from :class:`ttk.Widget`.
Options
@@ -645,18 +645,18 @@
Sizegrip
--------
-The :class:`ttk.Sizegrip` widget (also known as grow box) allows the user to
+The :class:`ttk.Sizegrip` widget (also known as a grow box) allows the user to
resize the containing toplevel window by pressing and dragging the grip.
-This widget has no specific options neither specific methods, besides the
+This widget has neither specific options nor specific methods, besides the
ones inherited from :class:`ttk.Widget`.
Platform-specific notes
^^^^^^^^^^^^^^^^^^^^^^^
-* On Mac OSX, toplevel windows automatically include a built-in size grip
- by default. Adding a Sizegrip there is harmless, since the built-in
+* On MacOS X, toplevel windows automatically include a built-in size grip
+ by default. Adding a :class:`Sizegrip` is harmless, since the built-in
grip will just mask the widget.
@@ -664,8 +664,8 @@
^^^^
* If the containing toplevel's position was specified relative to the right
- or bottom of the screen (e.g. ....), the Sizegrip widget will not resize
- the window.
+ or bottom of the screen (e.g. ....), the :class:`Sizegrip` widget will
+ not resize the window.
* This widget supports only "southeast" resizing.
@@ -678,16 +678,16 @@
label.
The order in which data values are displayed may be controlled by setting
-the widget option displaycolumns. The tree widget can also display column
+the widget option ``displaycolumns``. The tree widget can also display column
headings. Columns may be accessed by number or symbolic names listed in the
widget option columns. See `Column Identifiers`_.
Each item is identified by an unique name. The widget will generate item IDs
if they are not supplied by the caller. There is a distinguished root item,
-named {}. The root item itself is not displayed; its children appear at the
+named ``{}``. The root item itself is not displayed; its children appear at the
top level of the hierarchy.
-Each item also has a list of tags, which can be used to associate even bindings
+Each item also has a list of tags, which can be used to associate event bindings
with individual items and control the appearance of the item.
The Treeview widget supports horizontal and vertical scrolling, according to
@@ -698,7 +698,7 @@
Options
^^^^^^^
-This widget accepts the following specific option:
+This widget accepts the following specific options:
+----------------+--------------------------------------------------------+
| option | description |
@@ -726,8 +726,8 @@
| | be changed. |
| | |
| | Note that the application code and tag bindings can set|
- | | the selection however they wish, regardless the value |
- | | of this option. |
+ | | the selection however they wish, regardless of the |
+ | | value of this option. |
+----------------+--------------------------------------------------------+
| show | A list containing zero or more of the following values,|
| | specifying which elements of the tree to display. |
@@ -738,7 +738,7 @@
| | The default is "tree headings", i.e., show all |
| | elements. |
| | |
- | | **Note**: Column #0 always refer to the tree column, |
+ | | **Note**: Column #0 always refers to the tree column, |
| | even if show="tree" is not specified. |
+----------------+--------------------------------------------------------+
@@ -858,11 +858,11 @@
.. method:: set_children(item, *newchildren)
- Replaces item's child with *newchildren*.
+ Replaces *item*'s child with *newchildren*.
- Children present in item that are not present in *newchildren* are
- detached from tree. No items in *newchildren* may be an ancestor of
- item. Note that not specifying *newchildren* results in detaching
+ Children present in *item* that are not present in *newchildren* are
+ detached from the tree. No items in *newchildren* may be an ancestor of
+ *item*. Note that not specifying *newchildren* results in detaching
*item*'s children.
@@ -877,16 +877,16 @@
The valid options/values are:
* id
- Returns the column name, this is a read-only option.
+ Returns the column name. This is a read-only option.
* anchor: One of the standard Tk anchor values.
Specifies how the text in this column should be aligned with respect
to the cell.
* minwidth: width
The minimum width of the column in pixels. The treeview widget will
- not make the column any smaller than the specified by this option when
+ not make the column any smaller than specified by this option when
the widget is resized or the user drags a column.
* stretch: True/False
- Specifies wheter or not the column's width should be adjusted when
+ Specifies whether the column's width should be adjusted when
the widget is resized.
* width: width
The width of the column in pixels.
@@ -912,8 +912,7 @@
.. method:: exists(item)
- Returns True if the specified *item* is present in the three,
- False otherwise.
+ Returns True if the specified *item* is present in the tree.
.. method:: focus([item=None])
@@ -942,7 +941,7 @@
* command: callback
A callback to be invoked when the heading label is pressed.
- To configure the tree column heading, call this with column = "#0"
+ To configure the tree column heading, call this with column = "#0".
.. method:: identify(component, x, y)
@@ -985,7 +984,7 @@
.. method:: identify_element(x, y)
- Returns the element at position x, y.
+ Returns the element at position *x*, *y*.
Availability: Tk 8.6.
@@ -997,16 +996,16 @@
.. method:: insert(parent, index[, iid=None[, **kw]])
- Creates a new item and return the item identifier of the newly created
+ Creates a new item and returns the item identifier of the newly created
item.
*parent* is the item ID of the parent item, or the empty string to create
a new top-level item. *index* is an integer, or the value "end",
specifying where in the list of parent's children to insert the new item.
If *index* is less than or equal to zero, the new node is inserted at
- the beginning, if *index* is greater than or equal to the current number
+ the beginning; if *index* is greater than or equal to the current number
of children, it is inserted at the end. If *iid* is specified, it is used
- as the item identifier, *iid* must not already exist in the tree.
+ as the item identifier; *iid* must not already exist in the tree.
Otherwise, a new unique identifier is generated.
See `Item Options`_ for the list of available points.
@@ -1026,9 +1025,9 @@
Moves *item* to position *index* in *parent*'s list of children.
- It is illegal to move an item under one of its descendants. If index is
- less than or equal to zero, item is moved to the beginning, if greater
- than or equal to the number of children, it is moved to the end. If item
+ It is illegal to move an item under one of its descendants. If *index* is
+ less than or equal to zero, *item* is moved to the beginning; if greater
+ than or equal to the number of children, it is moved to the end. If *item*
was detached it is reattached.
@@ -1101,7 +1100,7 @@
.. method:: tag_bind(tagname[, sequence=None[, callback=None]])
Bind a callback for the given event *sequence* to the tag *tagname*.
- When an event is delivered to an item, the *callbacks* for each of the
+ When an event is delivered to an item, the callbacks for each of the
item's tags option are called.
@@ -1119,7 +1118,7 @@
If *item* is specified, returns 1 or 0 depending on whether the specified
*item* has the given *tagname*. Otherwise, returns a list of all items
- which have the specified tag.
+ that have the specified tag.
Availability: Tk 8.6
@@ -1159,7 +1158,7 @@
.. method:: configure(style, query_opt=None, **kw)
- Query or sets the default value of the specified option(s) in *style*.
+ Query or set the default value of the specified option(s) in *style*.
Each key in *kw* is an option and each value is a string identifying
the value for that option.
@@ -1185,10 +1184,10 @@
Query or sets dynamic values of the specified option(s) in *style*.
- Each key in kw is an option and each value should be a list or a
- tuple (usually) containing statespecs grouped in tuples, or list, or
- something else of your preference. A statespec is compound of one or more
- states and then a value.
+ Each key in *kw* is an option and each value should be a list or a
+ tuple (usually) containing statespecs grouped in tuples, lists, or
+ something else of your preference. A statespec is a compound of one
+ or more states and then a value.
An example may make it more understandable::
@@ -1208,12 +1207,10 @@
root.mainloop()
- There is a thing to note in this previous short example:
-
- * The order of the (states, value) sequences for an option does matter,
- if you changed the order to [('active', 'blue'), ('pressed', 'red')]
- in the foreground option, for example, you would get a blue foreground
- when the widget were in active or pressed states.
+ Note that the order of the (states, value) sequences for an option does
+ matter, if you changed the order to ``[('active', 'blue'), ('pressed',
+ 'red')]`` in the foreground option, for example, you would get a blue
+ foreground when the widget were in active or pressed states.
.. method:: lookup(style, option[, state=None[, default=None]])
@@ -1236,13 +1233,13 @@
Define the widget layout for given *style*. If *layoutspec* is omitted,
return the layout specification for given style.
- *layoutspec*, if specified, is expected to be a list, or some other
- sequence type (excluding string), where each item should be a tuple and
+ *layoutspec*, if specified, is expected to be a list or some other
+ sequence type (excluding strings), where each item should be a tuple and
the first item is the layout name and the second item should have the
format described described in `Layouts`_.
- To understand the format, check this example below (it is not intended
- to do anything useful)::
+ To understand the format, see the following example (it is not
+ intended to do anything useful)::
from tkinter import ttk
import tkinter
@@ -1268,12 +1265,12 @@
.. method:: element_create(elementname, etype, *args, **kw)
- Create a new element in the current theme of given *etype* which is
+ Create a new element in the current theme, of the given *etype* which is
expected to be either "image", "from" or "vsapi". The latter is only
available in Tk 8.6a for Windows XP and Vista and is not described here.
If "image" is used, *args* should contain the default image name followed
- by statespec/value pairs (this is the imagespec), *kw* may have the
+ by statespec/value pairs (this is the imagespec), and *kw* may have the
following options:
* border=padding
@@ -1296,11 +1293,12 @@
Specifies a minimum width for the element. If less than zero, the
base image's width is used as a default.
- But if "from" is used, then :meth:`element_create` will clone an existing
- element. *args* is expected to contain a themename, which is from where
+ If "from" is used as the value of *etype*,
+ :meth:`element_create` will clone an existing
+ element. *args* is expected to contain a themename, from which
the element will be cloned, and optionally an element to clone from.
If this element to clone from is not specified, an empty element will
- be used. *kw* is discarded here.
+ be used. *kw* is discarded.
.. method:: element_names()
@@ -1334,7 +1332,7 @@
:meth:`Style.configure`, :meth:`Style.map`, :meth:`Style.layout` and
:meth:`Style.element_create` respectively.
- As an example, lets change the Combobox for the default theme a bit::
+ As an example, let's change the Combobox for the default theme a bit::
from tkinter import ttk
import tkinter
@@ -1367,7 +1365,7 @@
.. method:: theme_use([themename])
- If *themename* is not given, returns the theme in use, otherwise, set
+ If *themename* is not given, returns the theme in use. Otherwise, sets
the current theme to *themename*, refreshes all widgets and emits a
<<ThemeChanged>> event.
@@ -1375,13 +1373,14 @@
Layouts
^^^^^^^
-A layout can be just None, if takes no options, or a dict of options specifying
-how to arrange the element. The layout mechanism uses a simplified
-version of the pack geometry manager: given an initial cavity, each element is
-allocated a parcel. Valid options/values are:
+A layout can be just None, if it takes no options, or a dict of
+options specifying how to arrange the element. The layout mechanism
+uses a simplified version of the pack geometry manager: given an
+initial cavity, each element is allocated a parcel. Valid
+options/values are:
* side: whichside
- Specifies which side of the cavity to place the the element; one of
+ Specifies which side of the cavity to place the element; one of
top, right, bottom or left. If omitted, the element occupies the
entire cavity.
Modified: python/branches/py3k-short-float-repr/Doc/library/urllib.request.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/urllib.request.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/urllib.request.rst Mon Apr 6 00:11:42 2009
@@ -40,7 +40,7 @@
commonly used to determine if a redirect was followed
* :meth:`info` --- return the meta-information of the page, such as headers,
- in the form of an ``http.client.HTTPMessage`` instance (see `Quick
+ in the form of an :class:`http.client.HTTPMessage` instance (see `Quick
Reference to HTTP Headers <http://www.cs.tut.fi/~jkorpela/http.html>`_)
Raises :exc:`URLError` on errors.
Modified: python/branches/py3k-short-float-repr/Doc/library/webbrowser.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/webbrowser.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/webbrowser.rst Mon Apr 6 00:11:42 2009
@@ -55,6 +55,10 @@
under many window managers this will occur regardless of the setting of this
variable).
+ Note that on some platforms, trying to open a filename using this function,
+ may work and start the operating system's associated program. However, this
+ is neither supported nor portable.
+
.. function:: open_new(url)
Modified: python/branches/py3k-short-float-repr/Doc/library/winreg.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/library/winreg.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/library/winreg.rst Mon Apr 6 00:11:42 2009
@@ -39,8 +39,8 @@
*key* is the predefined handle to connect to.
- The return value is the handle of the opened key. If the function fails, an
- :exc:`EnvironmentError` exception is raised.
+ The return value is the handle of the opened key. If the function fails, a
+ :exc:`WindowsError` exception is raised.
.. function:: CreateKey(key, sub_key)
@@ -57,8 +57,8 @@
If the key already exists, this function opens the existing key.
- The return value is the handle of the opened key. If the function fails, an
- :exc:`EnvironmentError` exception is raised.
+ The return value is the handle of the opened key. If the function fails, a
+ :exc:`WindowsError` exception is raised.
.. function:: DeleteKey(key, sub_key)
@@ -74,7 +74,7 @@
*This method can not delete keys with subkeys.*
If the method succeeds, the entire key, including all of its values, is removed.
- If the method fails, an :exc:`EnvironmentError` exception is raised.
+ If the method fails, a :exc:`WindowsError` exception is raised.
.. function:: DeleteValue(key, value)
@@ -97,7 +97,7 @@
*index* is an integer that identifies the index of the key to retrieve.
The function retrieves the name of one subkey each time it is called. It is
- typically called repeatedly until an :exc:`EnvironmentError` exception is
+ typically called repeatedly until a :exc:`WindowsError` exception is
raised, indicating, no more values are available.
@@ -111,7 +111,7 @@
*index* is an integer that identifies the index of the value to retrieve.
The function retrieves the name of one subkey each time it is called. It is
- typically called repeatedly, until an :exc:`EnvironmentError` exception is
+ typically called repeatedly, until a :exc:`WindowsError` exception is
raised, indicating no more values.
The result is a tuple of 3 items:
@@ -199,7 +199,7 @@
The result is a new handle to the specified key.
- If the function fails, :exc:`EnvironmentError` is raised.
+ If the function fails, :exc:`WindowsError` is raised.
.. function:: OpenKeyEx()
@@ -243,9 +243,10 @@
associated. If this parameter is ``None`` or empty, the function retrieves the
value set by the :func:`SetValue` method for the key identified by *key*.
- Values in the registry have name, type, and data components. This method
+ Values in the registry have name, type, and data components. This method
retrieves the data for a key's first value that has a NULL name. But the
- underlying API call doesn't return the type, Lame Lame Lame, DO NOT USE THIS!!!
+ underlying API call doesn't return the type, so always use
+ :func:`QueryValueEx` if possible.
.. function:: QueryValueEx(key, value_name)
Modified: python/branches/py3k-short-float-repr/Doc/reference/datamodel.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/reference/datamodel.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/reference/datamodel.rst Mon Apr 6 00:11:42 2009
@@ -59,12 +59,13 @@
they may be garbage-collected. An implementation is allowed to postpone garbage
collection or omit it altogether --- it is a matter of implementation quality
how garbage collection is implemented, as long as no objects are collected that
-are still reachable. (Implementation note: the current implementation uses a
+are still reachable. (Implementation note: CPython currently uses a
reference-counting scheme with (optional) delayed detection of cyclically linked
garbage, which collects most objects as soon as they become unreachable, but is
not guaranteed to collect garbage containing circular references. See the
documentation of the :mod:`gc` module for information on controlling the
-collection of cyclic garbage.)
+collection of cyclic garbage. Other implementations act differently and CPython
+may change.)
Note that the use of the implementation's tracing or debugging facilities may
keep objects alive that would normally be collectable. Also note that catching
Modified: python/branches/py3k-short-float-repr/Doc/tutorial/datastructures.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/tutorial/datastructures.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/tutorial/datastructures.rst Mon Apr 6 00:11:42 2009
@@ -347,13 +347,11 @@
>>> x, y, z = t
-This is called, appropriately enough, *sequence unpacking*. Sequence unpacking
-requires the list of variables on the left to have the same number of elements
-as the length of the sequence. Note that multiple assignment is really just a
-combination of tuple packing and sequence unpacking!
-
-There is a small bit of asymmetry here: packing multiple values always creates
-a tuple, and unpacking works for any sequence.
+This is called, appropriately enough, *sequence unpacking* and works for any
+sequence on the right-hand side. Sequence unpacking requires the list of
+variables on the left to have the same number of elements as the length of the
+sequence. Note that multiple assignment is really just a combination of tuple
+packing and sequence unpacking.
.. XXX Add a bit on the difference between tuples and lists.
Modified: python/branches/py3k-short-float-repr/Doc/tutorial/introduction.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/tutorial/introduction.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/tutorial/introduction.rst Mon Apr 6 00:11:42 2009
@@ -225,10 +225,9 @@
several lines of text just as you would do in C.
Note that whitespace at the beginning of the line is significant.
-If we make the string literal a "raw" string, however, the ``\n`` sequences are
-not converted to newlines, but the backslash at the end of the line, and the
-newline character in the source, are both included in the string as data. Thus,
-the example::
+If we make the string literal a "raw" string, ``\n`` sequences are not converted
+to newlines, but the backslash at the end of the line, and the newline character
+in the source, are both included in the string as data. Thus, the example::
hello = r"This is a rather long string containing\n\
several lines of text much as you would do in C."
@@ -240,22 +239,12 @@
This is a rather long string containing\n\
several lines of text much as you would do in C.
-Or, strings can be surrounded in a pair of matching triple-quotes: ``"""`` or
-``'''``. End of lines do not need to be escaped when using triple-quotes, but
-they will be included in the string. ::
-
- print("""
- Usage: thingy [OPTIONS]
- -h Display this usage message
- -H hostname Hostname to connect to
- """)
-
-produces the following output::
-
- Usage: thingy [OPTIONS]
- -h Display this usage message
- -H hostname Hostname to connect to
-
+The interpreter prints the result of string operations in the same way as they
+are typed for input: inside quotes, and with quotes and other funny characters
+escaped by backslashes, to show the precise value. The string is enclosed in
+double quotes if the string contains a single quote and no double quotes, else
+it's enclosed in single quotes. (The :func:`print` function, described later,
+can be used to write strings without quotes or escapes.)
Strings can be concatenated (glued together) with the ``+`` operator, and
repeated with ``*``::
Modified: python/branches/py3k-short-float-repr/Doc/whatsnew/2.6.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/whatsnew/2.6.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/whatsnew/2.6.rst Mon Apr 6 00:11:42 2009
@@ -86,8 +86,6 @@
.. ========================================================================
.. Large, PEP-level features and changes should be described here.
-.. Should there be a new section here for 3k migration?
-.. Or perhaps a more general section describing module changes/deprecation?
.. ========================================================================
Python 3.0
@@ -1678,7 +1676,7 @@
:attr:`__self__`, and :attr:`im_func` is also available as :attr:`__func__`.
The old names are still supported in Python 2.6, but are gone in 3.0.
-* An obscure change: when you use the the :func:`locals` function inside a
+* An obscure change: when you use the :func:`locals` function inside a
:keyword:`class` statement, the resulting dictionary no longer returns free
variables. (Free variables, in this case, are variables referenced in the
:keyword:`class` statement that aren't attributes of the class.)
Modified: python/branches/py3k-short-float-repr/Doc/whatsnew/2.7.rst
==============================================================================
--- python/branches/py3k-short-float-repr/Doc/whatsnew/2.7.rst (original)
+++ python/branches/py3k-short-float-repr/Doc/whatsnew/2.7.rst Mon Apr 6 00:11:42 2009
@@ -6,7 +6,7 @@
:Release: |release|
:Date: |today|
-.. Fix accents on Kristjan Valur Jonsson, Fuerstenau.
+.. Fix accents on Kristjan Valur Jonsson, Fuerstenau, Tarek Ziade.
.. $Id$
Rules for maintenance:
@@ -55,12 +55,32 @@
.. Compare with previous release in 2 - 3 sentences here.
add hyperlink when the documentation becomes available online.
+Python 3.1
+================
+
+Much as Python 2.6 incorporated features from Python 3.0,
+version 2.7 is influenced by features from 3.1.
+
+XXX mention importlib; anything else?
+
+One porting change: the :option:`-3` switch now automatically
+enables the :option:`-Qwarn` switch that causes warnings
+about using classic division with integers and long integers.
+
.. ========================================================================
.. Large, PEP-level features and changes should be described here.
-.. Should there be a new section here for 3k migration?
-.. Or perhaps a more general section describing module changes/deprecation?
.. ========================================================================
+PEP 372: Adding an ordered dictionary to collections
+====================================================
+
+XXX write this
+
+Several modules will now use :class:`OrderedDict` by default. The
+:mod:`ConfigParser` module uses :class:`OrderedDict` for the list
+of sections and the options within a section.
+The :meth:`namedtuple._asdict` method returns an :class:`OrderedDict`
+as well.
Other Language Changes
@@ -85,6 +105,43 @@
(Contributed by Fredrik Johansson and Victor Stinner; :issue:`3439`.)
+* The :class:`bytearray` type's :meth:`translate` method will
+ now accept None as its first argument. (Fixed by Georg Brandl;
+ :issue:`4759`.)
+
+.. ======================================================================
+
+
+Optimizations
+-------------
+
+Several performance enhancements have been added:
+
+.. * A new :program:`configure` option, :option:`--with-computed-gotos`,
+ compiles the main bytecode interpreter loop using a new dispatch
+ mechanism that gives speedups of up to 20%, depending on the system
+ and benchmark. The new mechanism is only supported on certain
+ compilers, such as gcc, SunPro, and icc.
+
+* The garbage collector now performs better when many objects are
+ being allocated without deallocating any. A full garbage collection
+ pass is only performed when the middle generation has been collected
+ 10 times and when the number of survivor objects from the middle
+ generation exceeds 10% of the number of objects in the oldest
+ generation. The second condition was added to reduce the number
+ of full garbage collections as the number of objects on the heap grows,
+ avoiding quadratic performance when allocating very many objects.
+ (Suggested by Martin von Loewis and implemented by Antoine Pitrou;
+ :issue:`4074`.)
+
+* The garbage collector tries to avoid tracking simple containers
+ which can't be part of a cycle. In Python 2.7, this is now true for
+ tuples and dicts containing atomic types (such as ints, strings,
+ etc.). Transitively, a dict containing tuples of atomic types won't
+ be tracked either. This helps reduce the cost of each
+ garbage collection by decreasing the number of objects to be
+ considered and traversed by the collector.
+ (Contributed by Antoine Pitrou; :issue:`4688`.)
* Integers are now stored internally either in base 2**15 or in base
2**30, the base being determined at build time. Previously, they
@@ -93,7 +150,7 @@
benchmark results on 32-bit machines have been mixed. Therefore,
the default is to use base 2**30 on 64-bit machines and base 2**15
on 32-bit machines; on Unix, there's a new configure option
- --enable-big-digits that can be used to override this default.
+ :option:`--enable-big-digits` that can be used to override this default.
Apart from the performance improvements this change should be
invisible to end users, with one exception: for testing and
@@ -106,41 +163,28 @@
>>> sys.long_info
sys.long_info(bits_per_digit=30, sizeof_digit=4)
-
(Contributed by Mark Dickinson; :issue:`4258`.)
-
-.. ======================================================================
-
-
-Optimizations
--------------
-
-A few performance enhancements have been added:
-
-* The garbage collector now performs better when many objects are
- being allocated without deallocating any. A full garbage collection
- pass is only performed when the middle generation has been collected
- 10 times and when the number of survivor objects from the middle
- generation exceeds 10% of the number of objects in the oldest
- generation. The second condition was added to reduce the number
- of full garbage collections as the number of objects on the heap grows,
- avoiding quadratic performance when allocating very many objects.
- (Suggested by Martin von Loewis and implemented by Antoine Pitrou;
- :issue:`4074`.)
-
-* The garbage collector tries to avoid tracking simple containers which
- can't be part of a cycle. As of now, this is true for tuples and dicts
- containing atomic types (such as ints, strings, etc.). Transitively, a dict
- containing tuples of atomic types won't be tracked either. This helps bring
- down the individual cost of each garbage collection, since it decreases the
- number of objects to be considered and traversed by the collector.
-
- To help diagnosing this optimization, a new function in the :mod:`gc`
- module, :func:`is_tracked`, returns True if a given instance is tracked
- by the garbage collector, False otherwise.
- (Contributed by Antoine Pitrou; :issue:`4688`.)
-
+ Another set of changes made long objects a few bytes smaller: 2 bytes
+ smaller on 32-bit systems and 6 bytes on 64-bit.
+ (Contributed by Mark Dickinson; :issue:`5260`.)
+
+* The division algorithm for long integers has been made faster
+ by tightening the inner loop, doing shifts instead of multiplications,
+ and fixing an unnecessary extra iteration.
+ Various benchmarks show speedups of between 50% and 150% for long
+ integer divisions and modulo operations.
+ (Contributed by Mark Dickinson; :issue:`5512`.)
+
+* The implementation of ``%`` checks for the left-side operand being
+ a Python string and special-cases it; this results in a 1-3%
+ performance increase for applications that frequently use ``%``
+ with strings, such as templating libraries.
+ (Implemented by Collin Winter; :issue:`5176`.)
+
+* List comprehensions with an ``if`` condition are compiled into
+ faster bytecode. (Patch by Antoine Pitrou, back-ported to 2.7
+ by Jeffrey Yasskin; :issue:`4715`.)
.. ======================================================================
@@ -153,15 +197,6 @@
:file:`Misc/NEWS` file in the source tree for a more complete list of
changes, or look through the Subversion logs for all the details.
-* In Distutils, distutils.sdist.add_defaults now uses package_dir and data_files
- to feed MANIFEST.
-
-* It is not mandatory anymore to store clear text passwords in the
- :file:`.pypirc` file when registering and uploading packages to PyPI. As long
- as the username is present in that file, the :mod:`distutils` package will
- prompt for the password if not present. (Added by tarek, with the initial
- contribution of Nathan Van Gheem; :issue:`4394`.)
-
* The :mod:`bz2` module's :class:`BZ2File` now supports the context
management protocol, so you can write ``with bz2.BZ2File(...) as f: ...``.
(Contributed by Hagen Fuerstenau; :issue:`3860`.)
@@ -200,21 +235,100 @@
Contributed by Raymond Hettinger; :issue:`1696199`.
+ The :class:`namedtuple` class now has an optional *rename* parameter.
+ If *rename* is True, field names that are invalid because they've
+ been repeated or that aren't legal Python identifiers will be
+ renamed to legal names that are derived from the field's
+ position within the list of fields:
+
+ >>> T=namedtuple('T', ['field1', '$illegal', 'for', 'field2'], rename=True)
+ >>> T._fields
+ ('field1', '_1', '_2', 'field2')
+
+ (Added by Raymond Hettinger; :issue:`1818`.)
+
+* In Distutils, :func:`distutils.sdist.add_defaults` now uses
+ *package_dir* and *data_files* to create the MANIFEST file.
+
+ It is no longer mandatory to store clear-text passwords in the
+ :file:`.pypirc` file when registering and uploading packages to PyPI. As long
+ as the username is present in that file, the :mod:`distutils` package will
+ prompt for the password if not present. (Added by Tarek Ziade,
+ based on an initial contribution by Nathan Van Gheem; :issue:`4394`.)
+
+* New method: the :class:`Decimal` class gained a
+ :meth:`from_float` class method that performs an exact conversion
+ of a floating-point number to a :class:`Decimal`.
+ Note that this is an **exact** conversion that strives for the
+ closest decimal approximation to the floating-point representation's value;
+ the resulting decimal value will therefore still include the inaccuracy,
+ if any.
+ For example, ``Decimal.from_float(0.1)`` returns
+ ``Decimal('0.1000000000000000055511151231257827021181583404541015625')``.
+ (Implemented by Raymond Hettinger; :issue:`4796`.)
+
+* A new function in the :mod:`gc` module, :func:`is_tracked`, returns
+ True if a given instance is tracked by the garbage collector, False
+ otherwise. (Contributed by Antoine Pitrou; :issue:`4688`.)
+
* The :mod:`gzip` module's :class:`GzipFile` now supports the context
management protocol, so you can write ``with gzip.GzipFile(...) as f: ...``.
(Contributed by Hagen Fuerstenau; :issue:`3860`.)
+ It's now possible to override the modification time
+ recorded in a gzipped file by providing an optional timestamp to
+ the constructor. (Contributed by Jacques Frechet; :issue:`4272`.)
* The :class:`io.FileIO` class now raises an :exc:`OSError` when passed
an invalid file descriptor. (Implemented by Benjamin Peterson;
:issue:`4991`.)
+* New function: ``itertools.compress(*data*, *selectors*)`` takes two
+ iterators. Elements of *data* are returned if the corresponding
+ value in *selectors* is True::
+
+ itertools.compress('ABCDEF', [1,0,1,0,1,1]) =>
+ A, C, E, F
+
+ New function: ``itertools.combinations_with_replacement(*iter*, *r*)``
+ returns all the possible *r*-length combinations of elements from the
+ iterable *iter*. Unlike :func:`combinations`, individual elements
+ can be repeated in the generated combinations::
+
+ itertools.combinations_with_replacement('abc', 2) =>
+ ('a', 'a'), ('a', 'b'), ('a', 'c'),
+ ('b', 'b'), ('b', 'c'), ('c', 'c')
+
+ Note that elements are treated as unique depending on their position
+ in the input, not their actual values.
+
+ The :class:`itertools.count` function now has a *step* argument that
+ allows incrementing by values other than 1. :func:`count` also
+ now allows keyword arguments, and using non-integer values such as
+ floats or :class:`Decimal` instances. (Implemented by Raymond
+ Hettinger; :issue:`5032`.)
+
+ :func:`itertools.combinations` and :func:`itertools.product` were
+ previously raising :exc:`ValueError` for values of *r* larger than
+ the input iterable. This was deemed a specification error, so they
+ now return an empty iterator. (Fixed by Raymond Hettinger; :issue:`4816`.)
+
+* The :mod:`json` module was upgraded to version 2.0.9 of the
+ simplejson package, which includes a C extension that makes
+ encoding and decoding faster.
+ (Contributed by Bob Ippolito; :issue:`4136`.)
+
+ To support the new :class:`OrderedDict` type, :func:`json.load`
+ now has an optional *object_pairs_hook* parameter that will be called
+ with any object literal that decodes to a list of pairs.
+ (Contributed by Raymond Hettinger; :issue:`5381`.)
+
* The :mod:`pydoc` module now has help for the various symbols that Python
uses. You can now do ``help('<<')`` or ``help('@')``, for example.
(Contributed by David Laban; :issue:`4739`.)
* A new function in the :mod:`subprocess` module,
:func:`check_output`, runs a command with a specified set of arguments
- and returns the command's output as a string if the command runs without
+ and returns the command's output as a string when the command runs without
error, or raises a :exc:`CalledProcessError` exception otherwise.
::
@@ -229,13 +343,41 @@
(Contributed by Gregory P. Smith.)
+* The ``sys.version_info`` value is now a named tuple, with attributes
+ named ``major``, ``minor``, ``micro``, ``releaselevel``, and ``serial``.
+ (Contributed by Ross Light; :issue:`4285`.)
+
+* The :mod:`unittest` module was enhanced in several ways.
+ Test cases can raise the :exc:`SkipTest` exception to skip a test.
+ (:issue:`1034053`.)
+ It will now use 'x' for expected failures
+ and 'u' for unexpected successes when run in its verbose mode.
+ (Contributed by Benjamin Peterson.)
+
+ The :meth:`assertRaises` and :meth:`failUnlessRaises` methods now
+ return a context handler when called without providing a callable
+ object to run. For example, you can write this::
+
+ with self.assertRaises(KeyError):
+ raise ValueError
+
+ (Implemented by Antoine Pitrou; :issue:`4444`.)
+
* The :func:`is_zipfile` function in the :mod:`zipfile` module will now
accept a file object, in addition to the path names accepted in earlier
versions. (Contributed by Gabriel Genellina; :issue:`4756`.)
+ :mod:`zipfile` now supports archiving empty directories and
+ extracts them correctly. (Fixed by Kuba Wieczorek; :issue:`4710`.)
+
.. ======================================================================
.. whole new modules get described in subsections here
+importlib: Importing Modules
+------------------------------
+
+XXX write this
+
ttk: Themed Widgets for Tk
--------------------------
@@ -266,11 +408,16 @@
debugged doesn't hold the GIL; the macro will now acquire it before printing.
(Contributed by Victor Stinner; :issue:`3632`.)
-* :cfunc:`Py_AddPendingCall` is now thread safe, letting any
+* :cfunc:`Py_AddPendingCall` is now thread-safe, letting any
worker thread submit notifications to the main Python thread. This
is particularly useful for asynchronous IO operations.
(Contributed by Kristjan Valur Jonsson; :issue:`4293`.)
+* The :program:`configure` script now checks for floating-point rounding bugs
+ on certain 32-bit Intel chips and defines a :cmacro:`X87_DOUBLE_ROUNDING`
+ preprocessor definition. No code currently uses this definition,
+ but it's available if anyone wishes to use it.
+ (Added by Mark Dickinson; :issue:`2937`.)
.. ======================================================================
@@ -293,6 +440,28 @@
Port-Specific Changes: Mac OS X
-----------------------------------
+* The ``/Library/Python/2.7/site-packages`` is now appended to
+ ``sys.path``, in order to share added packages between the system
+ installation and a user-installed copy of the same version.
+ (Changed by Ronald Oussoren; :issue:`4865`.)
+
+
+Other Changes and Fixes
+=======================
+
+* When importing a module from a :file:`.pyc` or :file:`.pyo` file
+ with an existing :file:`.py` counterpart, the :attr:`co_filename`
+ attributes of all code objects if the original filename is obsolete,
+ which can happen if the file has been renamed, moved, or is accessed
+ through different paths. (Patch by Ziga Seilnacht and Jean-Paul
+ Calderone; :issue:`1180193`.)
+
+* The :file:`regrtest.py` script now takes a :option:`--randseed=`
+ switch that takes an integer that will be used as the random seed
+ for the :option:`-r` option that executes tests in random order.
+ The :option:`-r` option also now reports the seed that was used
+ (Added by Collin Winter.)
+
.. ======================================================================
Modified: python/branches/py3k-short-float-repr/Include/patchlevel.h
==============================================================================
--- python/branches/py3k-short-float-repr/Include/patchlevel.h (original)
+++ python/branches/py3k-short-float-repr/Include/patchlevel.h Mon Apr 6 00:11:42 2009
@@ -23,7 +23,7 @@
#define PY_RELEASE_SERIAL 2
/* Version as a string */
-#define PY_VERSION "3.1a2"
+#define PY_VERSION "3.1a2+"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository) */
Modified: python/branches/py3k-short-float-repr/Lib/distutils/cmd.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/distutils/cmd.py (original)
+++ python/branches/py3k-short-float-repr/Lib/distutils/cmd.py Mon Apr 6 00:11:42 2009
@@ -333,7 +333,8 @@
# -- External world manipulation -----------------------------------
def warn(self, msg):
- log.warn("warning: %s: %s\n" % (self.get_command_name(), msg))
+ log.warn("warning: %s: %s\n" %
+ (self.get_command_name(), msg))
def execute(self, func, args, msg=None, level=1):
util.execute(func, args, msg, dry_run=self.dry_run)
Modified: python/branches/py3k-short-float-repr/Lib/distutils/log.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/distutils/log.py (original)
+++ python/branches/py3k-short-float-repr/Lib/distutils/log.py Mon Apr 6 00:11:42 2009
@@ -18,13 +18,14 @@
def _log(self, level, msg, args):
if level >= self.threshold:
- if not args:
- # msg may contain a '%'. If args is empty,
- # don't even try to string-format
- print(msg)
+ if args:
+ msg = msg % args
+ if level in (WARN, ERROR, FATAL):
+ stream = sys.stderr
else:
- print(msg % args)
- sys.stdout.flush()
+ stream = sys.stdout
+ stream.write('%s\n' % msg)
+ stream.flush()
def log(self, level, msg, *args):
self._log(level, msg, args)
Modified: python/branches/py3k-short-float-repr/Lib/distutils/tests/test_clean.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/distutils/tests/test_clean.py (original)
+++ python/branches/py3k-short-float-repr/Lib/distutils/tests/test_clean.py Mon Apr 6 00:11:42 2009
@@ -8,6 +8,7 @@
from distutils.tests import support
class cleanTestCase(support.TempdirManager,
+ support.LoggingSilencer,
unittest.TestCase):
def test_simple_run(self):
Modified: python/branches/py3k-short-float-repr/Lib/ftplib.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/ftplib.py (original)
+++ python/branches/py3k-short-float-repr/Lib/ftplib.py Mon Apr 6 00:11:42 2009
@@ -223,7 +223,7 @@
def voidresp(self):
"""Expect a response beginning with '2'."""
resp = self.getresp()
- if resp[0] != '2':
+ if resp[:1] != '2':
raise error_reply(resp)
return resp
@@ -522,8 +522,6 @@
resp = self.sendcmd('DELE ' + filename)
if resp[:3] in ('250', '200'):
return resp
- elif resp[:1] == '5':
- raise error_perm(resp)
else:
raise error_reply(resp)
Modified: python/branches/py3k-short-float-repr/Lib/glob.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/glob.py (original)
+++ python/branches/py3k-short-float-repr/Lib/glob.py Mon Apr 6 00:11:42 2009
@@ -16,7 +16,7 @@
return list(iglob(pathname))
def iglob(pathname):
- """Return a list of paths matching a pathname pattern.
+ """Return an iterator which yields the paths matching a pathname pattern.
The pattern may contain simple shell-style wildcards a la fnmatch.
Modified: python/branches/py3k-short-float-repr/Lib/multiprocessing/synchronize.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/multiprocessing/synchronize.py (original)
+++ python/branches/py3k-short-float-repr/Lib/multiprocessing/synchronize.py Mon Apr 6 00:11:42 2009
@@ -301,5 +301,10 @@
self._flag.release()
else:
self._cond.wait(timeout)
+
+ if self._flag.acquire(False):
+ self._flag.release()
+ return True
+ return False
finally:
self._cond.release()
Modified: python/branches/py3k-short-float-repr/Lib/optparse.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/optparse.py (original)
+++ python/branches/py3k-short-float-repr/Lib/optparse.py Mon Apr 6 00:11:42 2009
@@ -11,6 +11,7 @@
__version__ = "1.5.3"
__all__ = ['Option',
+ 'make_option',
'SUPPRESS_HELP',
'SUPPRESS_USAGE',
'Values',
Modified: python/branches/py3k-short-float-repr/Lib/pdb.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/pdb.py (original)
+++ python/branches/py3k-short-float-repr/Lib/pdb.py Mon Apr 6 00:11:42 2009
@@ -95,10 +95,14 @@
rcFile.close()
self.commands = {} # associates a command list to breakpoint numbers
- self.commands_doprompt = {} # for each bp num, tells if the prompt must be disp. after execing the cmd list
- self.commands_silent = {} # for each bp num, tells if the stack trace must be disp. after execing the cmd list
- self.commands_defining = False # True while in the process of defining a command list
- self.commands_bnum = None # The breakpoint number for which we are defining a list
+ self.commands_doprompt = {} # for each bp num, tells if the prompt
+ # must be disp. after execing the cmd list
+ self.commands_silent = {} # for each bp num, tells if the stack trace
+ # must be disp. after execing the cmd list
+ self.commands_defining = False # True while in the process of defining
+ # a command list
+ self.commands_bnum = None # The breakpoint number for which we are
+ # defining a list
def reset(self):
bdb.Bdb.reset(self)
@@ -114,6 +118,10 @@
self.forget()
self.stack, self.curindex = self.get_stack(f, t)
self.curframe = self.stack[self.curindex][0]
+ # The f_locals dictionary is updated from the actual frame
+ # locals whenever the .f_locals accessor is called, so we
+ # cache it here to ensure that modifications are not overwritten.
+ self.curframe_locals = self.curframe.f_locals
self.execRcLines()
# Can be executed earlier than 'setup' if desired
@@ -192,21 +200,30 @@
self.cmdloop()
self.forget()
+ def displayhook(self, obj):
+ """Custom displayhook for the exec in default(), which prevents
+ assignment of the _ variable in the builtins.
+ """
+ print(repr(obj))
+
def default(self, line):
if line[:1] == '!': line = line[1:]
- locals = self.curframe.f_locals
+ locals = self.curframe_locals
globals = self.curframe.f_globals
try:
code = compile(line + '\n', '<stdin>', 'single')
save_stdout = sys.stdout
save_stdin = sys.stdin
+ save_displayhook = sys.displayhook
try:
sys.stdin = self.stdin
sys.stdout = self.stdout
+ sys.displayhook = self.displayhook
exec(code, globals, locals)
finally:
sys.stdout = save_stdout
sys.stdin = save_stdin
+ sys.displayhook = save_displayhook
except:
t, v = sys.exc_info()[:2]
if type(t) == type(''):
@@ -349,7 +366,7 @@
try:
func = eval(arg,
self.curframe.f_globals,
- self.curframe.f_locals)
+ self.curframe_locals)
except:
func = arg
try:
@@ -597,6 +614,7 @@
else:
self.curindex = self.curindex - 1
self.curframe = self.stack[self.curindex][0]
+ self.curframe_locals = self.curframe.f_locals
self.print_stack_entry(self.stack[self.curindex])
self.lineno = None
do_u = do_up
@@ -607,6 +625,7 @@
else:
self.curindex = self.curindex + 1
self.curframe = self.stack[self.curindex][0]
+ self.curframe_locals = self.curframe.f_locals
self.print_stack_entry(self.stack[self.curindex])
self.lineno = None
do_d = do_down
@@ -670,7 +689,7 @@
def do_debug(self, arg):
sys.settrace(None)
globals = self.curframe.f_globals
- locals = self.curframe.f_locals
+ locals = self.curframe_locals
p = Pdb(self.completekey, self.stdin, self.stdout)
p.prompt = "(%s) " % self.prompt.strip()
print("ENTERING RECURSIVE DEBUGGER", file=self.stdout)
@@ -694,9 +713,8 @@
return 1
def do_args(self, arg):
- f = self.curframe
- co = f.f_code
- dict = f.f_locals
+ co = self.curframe.f_code
+ dict = self.curframe_locals
n = co.co_argcount
if co.co_flags & 4: n = n+1
if co.co_flags & 8: n = n+1
@@ -708,16 +726,15 @@
do_a = do_args
def do_retval(self, arg):
- if '__return__' in self.curframe.f_locals:
- print(self.curframe.f_locals['__return__'], file=self.stdout)
+ if '__return__' in self.curframe_locals:
+ print(self.curframe_locals['__return__'], file=self.stdout)
else:
print('*** Not yet returned!', file=self.stdout)
do_rv = do_retval
def _getval(self, arg):
try:
- return eval(arg, self.curframe.f_globals,
- self.curframe.f_locals)
+ return eval(arg, self.curframe.f_globals, self.curframe_locals)
except:
t, v = sys.exc_info()[:2]
if isinstance(t, str):
@@ -788,7 +805,7 @@
def do_whatis(self, arg):
try:
value = eval(arg, self.curframe.f_globals,
- self.curframe.f_locals)
+ self.curframe_locals)
except:
t, v = sys.exc_info()[:2]
if type(t) == type(''):
Modified: python/branches/py3k-short-float-repr/Lib/pydoc.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/pydoc.py (original)
+++ python/branches/py3k-short-float-repr/Lib/pydoc.py Mon Apr 6 00:11:42 2009
@@ -1922,8 +1922,12 @@
if key is None:
callback(None, modname, '')
else:
- loader = importer.find_module(modname)
- if hasattr(loader,'get_source'):
+ try:
+ loader = importer.find_module(modname)
+ except SyntaxError:
+ # raised by tests for bad coding cookies or BOM
+ continue
+ if hasattr(loader, 'get_source'):
try:
source = loader.get_source(modname)
except UnicodeDecodeError:
@@ -1932,7 +1936,7 @@
continue
import io
desc = source_synopsis(io.StringIO(source)) or ''
- if hasattr(loader,'get_filename'):
+ if hasattr(loader, 'get_filename'):
path = loader.get_filename(modname)
else:
path = None
Deleted: python/branches/py3k-short-float-repr/Lib/test/README
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/test/README Mon Apr 6 00:11:42 2009
+++ (empty file)
@@ -1,411 +0,0 @@
-+++++++++++++++++++++++++++++++
-Writing Python Regression Tests
-+++++++++++++++++++++++++++++++
-
-:Author: Skip Montanaro
-:Contact: skip at pobox.com
-
-Introduction
-============
-
-If you add a new module to Python or modify the functionality of an existing
-module, you should write one or more test cases to exercise that new
-functionality. There are different ways to do this within the regression
-testing facility provided with Python; any particular test should use only
-one of these options. Each option requires writing a test module using the
-conventions of the selected option:
-
- - unittest_ based tests
- - doctest_ based tests
- - "traditional" Python test modules
-
-Regardless of the mechanics of the testing approach you choose,
-you will be writing unit tests (isolated tests of functions and objects
-defined by the module) using white box techniques. Unlike black box
-testing, where you only have the external interfaces to guide your test case
-writing, in white box testing you can see the code being tested and tailor
-your test cases to exercise it more completely. In particular, you will be
-able to refer to the C and Python code in the CVS repository when writing
-your regression test cases.
-
-.. _unittest: http://www.python.org/doc/current/lib/module-unittest.html
-.. _doctest: http://www.python.org/doc/current/lib/module-doctest.html
-
-unittest-based tests
-------------------
-The unittest_ framework is based on the ideas of unit testing as espoused
-by Kent Beck and the `Extreme Programming`_ (XP) movement. The specific
-interface provided by the framework is tightly based on the JUnit_
-Java implementation of Beck's original SmallTalk test framework. Please
-see the documentation of the unittest_ module for detailed information on
-the interface and general guidelines on writing unittest-based tests.
-
-The test_support helper module provides a function for use by
-unittest-based tests in the Python regression testing framework,
-``run_unittest()``. This is the primary way of running tests in the
-standard library. You can pass it any number of the following:
-
-- classes derived from or instances of ``unittest.TestCase`` or
- ``unittest.TestSuite``. These will be handed off to unittest for
- converting into a proper TestSuite instance.
-
-- a string; this must be a key in sys.modules. The module associated with
- that string will be scanned by ``unittest.TestLoader.loadTestsFromModule``.
- This is usually seen as ``test_support.run_unittest(__name__)`` in a test
- module's ``test_main()`` function. This has the advantage of picking up
- new tests automatically, without you having to add each new test case
- manually.
-
-All test methods in the Python regression framework have names that
-start with "``test_``" and use lower-case names with words separated with
-underscores.
-
-Test methods should *not* have docstrings! The unittest module prints
-the docstring if there is one, but otherwise prints the function name
-and the full class name. When there's a problem with a test, the
-latter information makes it easier to find the source for the test
-than the docstring.
-
-All unittest-based tests in the Python test suite use boilerplate that
-looks like this (with minor variations)::
-
- import unittest
- from test import test_support
-
- class MyTestCase1(unittest.TestCase):
-
- # Define setUp and tearDown only if needed
-
- def setUp(self):
- unittest.TestCase.setUp(self)
- ... additional initialization...
-
- def tearDown(self):
- ... additional finalization...
- unittest.TestCase.tearDown(self)
-
- def test_feature_one(self):
- # Testing feature one
- ...unit test for feature one...
-
- def test_feature_two(self):
- # Testing feature two
- ...unit test for feature two...
-
- ...etc...
-
- class MyTestCase2(unittest.TestCase):
- ...same structure as MyTestCase1...
-
- ...etc...
-
- def test_main():
- test_support.run_unittest(__name__)
-
- if __name__ == "__main__":
- test_main()
-
-This has the advantage that it allows the unittest module to be used
-as a script to run individual tests as well as working well with the
-regrtest framework.
-
-.. _Extreme Programming: http://www.extremeprogramming.org/
-.. _JUnit: http://www.junit.org/
-
-doctest based tests
--------------------
-Tests written to use doctest_ are actually part of the docstrings for
-the module being tested. Each test is written as a display of an
-interactive session, including the Python prompts, statements that would
-be typed by the user, and the output of those statements (including
-tracebacks, although only the exception msg needs to be retained then).
-The module in the test package is simply a wrapper that causes doctest
-to run over the tests in the module. The test for the difflib module
-provides a convenient example::
-
- import difflib
- from test import test_support
- test_support.run_doctest(difflib)
-
-If the test is successful, nothing is written to stdout (so you should not
-create a corresponding output/test_difflib file), but running regrtest
-with -v will give a detailed report, the same as if passing -v to doctest.
-
-A second argument can be passed to run_doctest to tell doctest to search
-``sys.argv`` for -v instead of using test_support's idea of verbosity. This
-is useful for writing doctest-based tests that aren't simply running a
-doctest'ed Lib module, but contain the doctests themselves. Then at
-times you may want to run such a test directly as a doctest, independent
-of the regrtest framework. The tail end of test_descrtut.py is a good
-example::
-
- def test_main(verbose=None):
- from test import test_support, test_descrtut
- test_support.run_doctest(test_descrtut, verbose)
-
- if __name__ == "__main__":
- test_main(1)
-
-If run via regrtest, ``test_main()`` is called (by regrtest) without
-specifying verbose, and then test_support's idea of verbosity is used. But
-when run directly, ``test_main(1)`` is called, and then doctest's idea of
-verbosity is used.
-
-See the documentation for the doctest module for information on
-writing tests using the doctest framework.
-
-"traditional" Python test modules
----------------------------------
-The mechanics of how the "traditional" test system operates are fairly
-straightforward. When a test case is run, the output is compared with the
-expected output that is stored in .../Lib/test/output. If the test runs to
-completion and the actual and expected outputs match, the test succeeds, if
-not, it fails. If an ``ImportError`` or ``test_support.TestSkipped`` error
-is raised, the test is not run.
-
-Executing Test Cases
-====================
-If you are writing test cases for module spam, you need to create a file
-in .../Lib/test named test_spam.py. In addition, if the tests are expected
-to write to stdout during a successful run, you also need to create an
-expected output file in .../Lib/test/output named test_spam ("..."
-represents the top-level directory in the Python source tree, the directory
-containing the configure script). If needed, generate the initial version
-of the test output file by executing::
-
- ./python Lib/test/regrtest.py -g test_spam.py
-
-from the top-level directory.
-
-Any time you modify test_spam.py you need to generate a new expected
-output file. Don't forget to desk check the generated output to make sure
-it's really what you expected to find! All in all it's usually better
-not to have an expected-out file (note that doctest- and unittest-based
-tests do not).
-
-To run a single test after modifying a module, simply run regrtest.py
-without the -g flag::
-
- ./python Lib/test/regrtest.py test_spam.py
-
-While debugging a regression test, you can of course execute it
-independently of the regression testing framework and see what it prints::
-
- ./python Lib/test/test_spam.py
-
-To run the entire test suite:
-
-- [UNIX, + other platforms where "make" works] Make the "test" target at the
- top level::
-
- make test
-
-- [WINDOWS] Run rt.bat from your PCBuild directory. Read the comments at
- the top of rt.bat for the use of special -d, -O and -q options processed
- by rt.bat.
-
-- [OTHER] You can simply execute the two runs of regrtest (optimized and
- non-optimized) directly::
-
- ./python Lib/test/regrtest.py
- ./python -O Lib/test/regrtest.py
-
-But note that this way picks up whatever .pyc and .pyo files happen to be
-around. The makefile and rt.bat ways run the tests twice, the first time
-removing all .pyc and .pyo files from the subtree rooted at Lib/.
-
-Test cases generate output based upon values computed by the test code.
-When executed, regrtest.py compares the actual output generated by executing
-the test case with the expected output and reports success or failure. It
-stands to reason that if the actual and expected outputs are to match, they
-must not contain any machine dependencies. This means your test cases
-should not print out absolute machine addresses (e.g. the return value of
-the id() builtin function) or floating point numbers with large numbers of
-significant digits (unless you understand what you are doing!).
-
-
-Test Case Writing Tips
-======================
-Writing good test cases is a skilled task and is too complex to discuss in
-detail in this short document. Many books have been written on the subject.
-I'll show my age by suggesting that Glenford Myers' `"The Art of Software
-Testing"`_, published in 1979, is still the best introduction to the subject
-available. It is short (177 pages), easy to read, and discusses the major
-elements of software testing, though its publication predates the
-object-oriented software revolution, so doesn't cover that subject at all.
-Unfortunately, it is very expensive (about $100 new). If you can borrow it
-or find it used (around $20), I strongly urge you to pick up a copy.
-
-The most important goal when writing test cases is to break things. A test
-case that doesn't uncover a bug is much less valuable than one that does.
-In designing test cases you should pay attention to the following:
-
- * Your test cases should exercise all the functions and objects defined
- in the module, not just the ones meant to be called by users of your
- module. This may require you to write test code that uses the module
- in ways you don't expect (explicitly calling internal functions, for
- example - see test_atexit.py).
-
- * You should consider any boundary values that may tickle exceptional
- conditions (e.g. if you were writing regression tests for division,
- you might well want to generate tests with numerators and denominators
- at the limits of floating point and integer numbers on the machine
- performing the tests as well as a denominator of zero).
-
- * You should exercise as many paths through the code as possible. This
- may not always be possible, but is a goal to strive for. In
- particular, when considering if statements (or their equivalent), you
- want to create test cases that exercise both the true and false
- branches. For loops, you should create test cases that exercise the
- loop zero, one and multiple times.
-
- * You should test with obviously invalid input. If you know that a
- function requires an integer input, try calling it with other types of
- objects to see how it responds.
-
- * You should test with obviously out-of-range input. If the domain of a
- function is only defined for positive integers, try calling it with a
- negative integer.
-
- * If you are going to fix a bug that wasn't uncovered by an existing
- test, try to write a test case that exposes the bug (preferably before
- fixing it).
-
- * If you need to create a temporary file, you can use the filename in
- ``test_support.TESTFN`` to do so. It is important to remove the file
- when done; other tests should be able to use the name without cleaning
- up after your test.
-
-.. _"The Art of Software Testing":
- http://www.amazon.com/exec/obidos/ISBN=0471043281
-
-Regression Test Writing Rules
-=============================
-Each test case is different. There is no "standard" form for a Python
-regression test case, though there are some general rules (note that
-these mostly apply only to the "classic" tests; unittest_- and doctest_-
-based tests should follow the conventions natural to those frameworks)::
-
- * If your test case detects a failure, raise ``TestFailed`` (found in
- ``test.test_support``).
-
- * Import everything you'll need as early as possible.
-
- * If you'll be importing objects from a module that is at least
- partially platform-dependent, only import those objects you need for
- the current test case to avoid spurious ``ImportError`` exceptions
- that prevent the test from running to completion.
-
- * Print all your test case results using the ``print`` statement. For
- non-fatal errors, print an error message (or omit a successful
- completion print) to indicate the failure, but proceed instead of
- raising ``TestFailed``.
-
- * Use ``assert`` sparingly, if at all. It's usually better to just print
- what you got, and rely on regrtest's got-vs-expected comparison to
- catch deviations from what you expect. ``assert`` statements aren't
- executed at all when regrtest is run in -O mode; and, because they
- cause the test to stop immediately, can lead to a long & tedious
- test-fix, test-fix, test-fix, ... cycle when things are badly broken
- (and note that "badly broken" often includes running the test suite
- for the first time on new platforms or under new implementations of
- the language).
-
-Miscellaneous
-=============
-There is a test_support module in the test package you can import for
-your test case. Import this module using either::
-
- import test.test_support
-
-or::
-
- from test import test_support
-
-test_support provides the following useful objects:
-
- * ``TestFailed`` - raise this exception when your regression test detects
- a failure.
-
- * ``TestSkipped`` - raise this if the test could not be run because the
- platform doesn't offer all the required facilities (like large
- file support), even if all the required modules are available.
-
- * ``ResourceDenied`` - this is raised when a test requires a resource that
- is not available. Primarily used by 'requires'.
-
- * ``verbose`` - you can use this variable to control print output. Many
- modules use it. Search for "verbose" in the test_*.py files to see
- lots of examples.
-
- * ``forget(module_name)`` - attempts to cause Python to "forget" that it
- loaded a module and erase any PYC files.
-
- * ``is_resource_enabled(resource)`` - Returns a boolean based on whether
- the resource is enabled or not.
-
- * ``requires(resource [, msg])`` - if the required resource is not
- available the ResourceDenied exception is raised.
-
- * ``verify(condition, reason='test failed')``. Use this instead of::
-
- assert condition[, reason]
-
- ``verify()`` has two advantages over ``assert``: it works even in -O
- mode, and it raises ``TestFailed`` on failure instead of
- ``AssertionError``.
-
- * ``is_jython`` - true if the interpreter is Jython, false otherwise.
-
- * ``TESTFN`` - a string that should always be used as the filename when
- you need to create a temp file. Also use ``try``/``finally`` to
- ensure that your temp files are deleted before your test completes.
- Note that you cannot unlink an open file on all operating systems, so
- also be sure to close temp files before trying to unlink them.
-
- * ``sortdict(dict)`` - acts like ``repr(dict.items())``, but sorts the
- items first. This is important when printing a dict value, because
- the order of items produced by ``dict.items()`` is not defined by the
- language.
-
- * ``findfile(file)`` - you can call this function to locate a file
- somewhere along sys.path or in the Lib/test tree - see
- test_ossaudiodev.py for an example of its use.
-
- * ``fcmp(x,y)`` - you can call this function to compare two floating
- point numbers when you expect them to only be approximately equal
- withing a fuzz factor (``test_support.FUZZ``, which defaults to 1e-6).
-
- * ``check_syntax_error(testcase, statement)`` - make sure that the
- statement is *not* correct Python syntax.
-
-
-Some Non-Obvious regrtest Features
-==================================
- * Automagic test detection: When you create a new test file
- test_spam.py, you do not need to modify regrtest (or anything else)
- to advertise its existence. regrtest searches for and runs all
- modules in the test directory with names of the form test_xxx.py.
-
- * Miranda output: If, when running test_spam.py, regrtest does not
- find an expected-output file test/output/test_spam, regrtest
- pretends that it did find one, containing the single line
-
- test_spam
-
- This allows new tests that don't expect to print anything to stdout
- to not bother creating expected-output files.
-
- * Two-stage testing: To run test_spam.py, regrtest imports test_spam
- as a module. Most tests run to completion as a side-effect of
- getting imported. After importing test_spam, regrtest also executes
- ``test_spam.test_main()``, if test_spam has a ``test_main`` attribute.
- This is rarely required with the "traditional" Python tests, and
- you shouldn't create a module global with name test_main unless
- you're specifically exploiting this gimmick. This usage does
- prove useful with unittest-based tests as well, however; defining
- a ``test_main()`` which is run by regrtest and a script-stub in the
- test module ("``if __name__ == '__main__': test_main()``") allows
- the test to be used like any other Python test and also work
- with the unittest.py-as-a-script approach, allowing a developer
- to run specific tests from the command line.
Modified: python/branches/py3k-short-float-repr/Lib/test/test_logging.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/test/test_logging.py (original)
+++ python/branches/py3k-short-float-repr/Lib/test/test_logging.py Mon Apr 6 00:11:42 2009
@@ -912,10 +912,10 @@
class WarningsTest(BaseTest):
def test_warnings(self):
- logging.captureWarnings(True)
with warnings.catch_warnings():
- warnings.filterwarnings("always", category=UserWarning)
+ logging.captureWarnings(True)
try:
+ warnings.filterwarnings("always", category=UserWarning)
file = io.StringIO()
h = logging.StreamHandler(file)
logger = logging.getLogger("py.warnings")
Modified: python/branches/py3k-short-float-repr/Lib/test/test_multiprocessing.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/test/test_multiprocessing.py (original)
+++ python/branches/py3k-short-float-repr/Lib/test/test_multiprocessing.py Mon Apr 6 00:11:42 2009
@@ -750,20 +750,22 @@
# Removed temporaily, due to API shear, this does not
# work with threading._Event objects. is_set == isSet
- #self.assertEqual(event.is_set(), False)
+ self.assertEqual(event.is_set(), False)
- self.assertEqual(wait(0.0), None)
+ # Removed, threading.Event.wait() will return the value of the __flag
+ # instead of None. API Shear with the semaphore backed mp.Event
+ self.assertEqual(wait(0.0), False)
self.assertTimingAlmostEqual(wait.elapsed, 0.0)
- self.assertEqual(wait(TIMEOUT1), None)
+ self.assertEqual(wait(TIMEOUT1), False)
self.assertTimingAlmostEqual(wait.elapsed, TIMEOUT1)
event.set()
# See note above on the API differences
- # self.assertEqual(event.is_set(), True)
- self.assertEqual(wait(), None)
+ self.assertEqual(event.is_set(), True)
+ self.assertEqual(wait(), True)
self.assertTimingAlmostEqual(wait.elapsed, 0.0)
- self.assertEqual(wait(TIMEOUT1), None)
+ self.assertEqual(wait(TIMEOUT1), True)
self.assertTimingAlmostEqual(wait.elapsed, 0.0)
# self.assertEqual(event.is_set(), True)
@@ -772,7 +774,7 @@
#self.assertEqual(event.is_set(), False)
self.Process(target=self._test_event, args=(event,)).start()
- self.assertEqual(wait(), None)
+ self.assertEqual(wait(), True)
#
#
Modified: python/branches/py3k-short-float-repr/Lib/test/test_pprint.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/test/test_pprint.py (original)
+++ python/branches/py3k-short-float-repr/Lib/test/test_pprint.py Mon Apr 6 00:11:42 2009
@@ -115,10 +115,10 @@
{}, dict2(), dict3(),
verify, pprint,
-6, -6, -6-6j, -1.5, "x", b"x", (3,), [3], {3: 6},
- (1,2), [3,4], {5: 6, 7: 8},
+ (1,2), [3,4], {5: 6},
tuple2((1,2)), tuple3((1,2)), tuple3(range(100)),
[3,4], list2([3,4]), list3([3,4]), list3(range(100)),
- {5: 6, 7: 8}, dict2({5: 6}), dict3({5: 6}),
+ dict2({5: 6}), dict3({5: 6}),
range(10, -11, -1)
):
native = repr(simple)
Modified: python/branches/py3k-short-float-repr/Lib/test/test_sys.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/test/test_sys.py (original)
+++ python/branches/py3k-short-float-repr/Lib/test/test_sys.py Mon Apr 6 00:11:42 2009
@@ -225,6 +225,11 @@
sys.setdlopenflags(oldflags)
def test_refcount(self):
+ # n here must be a global in order for this test to pass while
+ # tracing with a python function. Tracing calls PyFrame_FastToLocals
+ # which will add a copy of any locals to the frame object, causing
+ # the reference count to increase by 2 instead of 1.
+ global n
self.assertRaises(TypeError, sys.getrefcount)
c = sys.getrefcount(None)
n = None
Modified: python/branches/py3k-short-float-repr/Lib/test/test_threading.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/test/test_threading.py (original)
+++ python/branches/py3k-short-float-repr/Lib/test/test_threading.py Mon Apr 6 00:11:42 2009
@@ -84,11 +84,24 @@
t.join(NUMTASKS)
self.assert_(not t.is_alive())
self.failIfEqual(t.ident, 0)
+ self.assertFalse(t.ident is None)
self.assert_(re.match('<TestThread\(.*, \w+ -?\d+\)>', repr(t)))
if verbose:
print('all tasks done')
self.assertEqual(numrunning.get(), 0)
+ def test_ident_of_no_threading_threads(self):
+ # The ident still must work for the main thread and dummy threads.
+ self.assertFalse(threading.currentThread().ident is None)
+ def f():
+ ident.append(threading.currentThread().ident)
+ done.set()
+ done = threading.Event()
+ ident = []
+ _thread.start_new_thread(f, ())
+ done.wait()
+ self.assertFalse(ident[0] is None)
+
# run with a small(ish) thread stack size (256kB)
def test_various_ops_small_stack(self):
if verbose:
@@ -187,7 +200,8 @@
# Now raise an exception in the worker thread.
if verbose:
print(" waiting for worker thread to get started")
- worker_started.wait()
+ ret = worker_started.wait()
+ self.assertTrue(ret)
if verbose:
print(" verifying worker hasn't exited")
self.assert_(not t.finished)
Modified: python/branches/py3k-short-float-repr/Lib/test/test_traceback.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/test/test_traceback.py (original)
+++ python/branches/py3k-short-float-repr/Lib/test/test_traceback.py Mon Apr 6 00:11:42 2009
@@ -10,16 +10,6 @@
import traceback
-try:
- raise KeyError
-except KeyError:
- type_, value, tb = sys.exc_info()
- file_ = StringIO()
- traceback_print(tb, file_)
- example_traceback = file_.getvalue()
-else:
- raise Error("unable to create test traceback string")
-
class SyntaxTracebackCases(unittest.TestCase):
# For now, a very minimal set of tests. I want to be sure that
@@ -158,9 +148,24 @@
class TracebackFormatTests(unittest.TestCase):
- def test_traceback_indentation(self):
+ def test_traceback_format(self):
+ try:
+ raise KeyError('blah')
+ except KeyError:
+ type_, value, tb = sys.exc_info()
+ traceback_fmt = 'Traceback (most recent call last):\n' + \
+ ''.join(traceback.format_tb(tb))
+ file_ = StringIO()
+ traceback_print(tb, file_)
+ python_fmt = file_.getvalue()
+ else:
+ raise Error("unable to create test traceback string")
+
+ # Make sure that Python and the traceback module format the same thing
+ self.assertEquals(traceback_fmt, python_fmt)
+
# Make sure that the traceback is properly indented.
- tb_lines = example_traceback.splitlines()
+ tb_lines = python_fmt.splitlines()
self.assertEquals(len(tb_lines), 3)
banner, location, source_line = tb_lines
self.assert_(banner.startswith('Traceback'))
Modified: python/branches/py3k-short-float-repr/Lib/threading.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/threading.py (original)
+++ python/branches/py3k-short-float-repr/Lib/threading.py Mon Apr 6 00:11:42 2009
@@ -375,6 +375,7 @@
try:
if not self._flag:
self._cond.wait(timeout)
+ return self._flag
finally:
self._cond.release()
@@ -450,9 +451,8 @@
raise RuntimeError("thread already started")
if __debug__:
self._note("%s.start(): starting thread", self)
- _active_limbo_lock.acquire()
- _limbo[self] = self
- _active_limbo_lock.release()
+ with _active_limbo_lock:
+ _limbo[self] = self
_start_new_thread(self._bootstrap, ())
self._started.wait()
@@ -485,14 +485,16 @@
return
raise
+ def _set_ident(self):
+ self._ident = _get_ident()
+
def _bootstrap_inner(self):
try:
- self._ident = _get_ident()
+ self._set_ident()
self._started.set()
- _active_limbo_lock.acquire()
- _active[self._ident] = self
- del _limbo[self]
- _active_limbo_lock.release()
+ with _active_limbo_lock:
+ _active[self._ident] = self
+ del _limbo[self]
if __debug__:
self._note("%s._bootstrap(): thread started", self)
@@ -721,9 +723,9 @@
def __init__(self):
Thread.__init__(self, name="MainThread")
self._started.set()
- _active_limbo_lock.acquire()
- _active[_get_ident()] = self
- _active_limbo_lock.release()
+ self._set_ident()
+ with _active_limbo_lock:
+ _active[self._ident] = self
def _set_daemon(self):
return False
@@ -768,9 +770,9 @@
self._started.set()
- _active_limbo_lock.acquire()
- _active[_get_ident()] = self
- _active_limbo_lock.release()
+ self._set_ident()
+ with _active_limbo_lock:
+ _active[self._ident] = self
def _set_daemon(self):
return True
@@ -791,18 +793,14 @@
currentThread = current_thread
def active_count():
- _active_limbo_lock.acquire()
- count = len(_active) + len(_limbo)
- _active_limbo_lock.release()
- return count
+ with _active_limbo_lock:
+ return len(_active) + len(_limbo)
activeCount = active_count
def enumerate():
- _active_limbo_lock.acquire()
- active = list(_active.values()) + list(_limbo.values())
- _active_limbo_lock.release()
- return active
+ with _active_limbo_lock:
+ return list(_active.values()) + list(_limbo.values())
from _thread import stack_size
Modified: python/branches/py3k-short-float-repr/Lib/traceback.py
==============================================================================
--- python/branches/py3k-short-float-repr/Lib/traceback.py (original)
+++ python/branches/py3k-short-float-repr/Lib/traceback.py Mon Apr 6 00:11:42 2009
@@ -63,7 +63,7 @@
filename = co.co_filename
name = co.co_name
_print(file,
- ' File "%s", line %d, in %s' % (filename,lineno,name))
+ ' File "%s", line %d, in %s' % (filename, lineno, name))
linecache.checkcache(filename)
line = linecache.getline(filename, lineno, f.f_globals)
if line: _print(file, ' ' + line.strip())
@@ -159,9 +159,8 @@
_print(file, 'Traceback (most recent call last):')
print_tb(tb, limit, file)
lines = format_exception_only(type(value), value)
- for line in lines[:-1]:
- _print(file, line, ' ')
- _print(file, lines[-1], '')
+ for line in lines:
+ _print(file, line, '')
def format_exception(etype, value, tb, limit=None, chain=True):
"""Format a stack trace and the exception information.
Modified: python/branches/py3k-short-float-repr/Makefile.pre.in
==============================================================================
--- python/branches/py3k-short-float-repr/Makefile.pre.in (original)
+++ python/branches/py3k-short-float-repr/Makefile.pre.in Mon Apr 6 00:11:42 2009
@@ -586,8 +586,7 @@
Objects/bytearrayobject.o: $(srcdir)/Objects/bytearrayobject.c $(BYTESTR_DEPS)
Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c \
- $(BYTESTR_DEPS) \
- $(srcdir)/Objects/stringlib/formatter.h
+ $(BYTESTR_DEPS)
$(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
$(OPCODETARGETGEN) $(OPCODETARGETS_H)
Modified: python/branches/py3k-short-float-repr/Misc/ACKS
==============================================================================
--- python/branches/py3k-short-float-repr/Misc/ACKS (original)
+++ python/branches/py3k-short-float-repr/Misc/ACKS Mon Apr 6 00:11:42 2009
@@ -392,6 +392,7 @@
Greg Kochanski
Damon Kohler
Joseph Koshy
+Maksim Kozyarchuk
Bob Kras
Holger Krekel
Michael Kremer
Modified: python/branches/py3k-short-float-repr/Misc/NEWS
==============================================================================
--- python/branches/py3k-short-float-repr/Misc/NEWS (original)
+++ python/branches/py3k-short-float-repr/Misc/NEWS Mon Apr 6 00:11:42 2009
@@ -4,6 +4,18 @@
(editors: check NEWS.help for information about editing NEWS using ReST.)
+What's New in Python 3.1 beta 1?
+================================
+
+*Release date: XXXX-XX-XX*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
What's New in Python 3.1 alpha 2?
=================================
@@ -68,7 +80,7 @@
Library
-------
-- Issue 2625: added missing items() call to the for loop in
+- Issue #2625: added missing items() call to the for loop in
mailbox.MH.get_message().
- Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat
@@ -175,7 +187,7 @@
the type definition cmpfunc. The tp_compare slot has been renamed
to tp_reserved, and is reserved for future usage.
-- Issue 1242657: the __len__() and __length_hint__() calls in several tools
+- Issue #1242657: the __len__() and __length_hint__() calls in several tools
were suppressing all exceptions. These include list() and bytearray().
- Issue #4707: round(x, n) now returns an integer if x is an integer.
@@ -315,6 +327,10 @@
Library
-------
+- Issue #5694: removed spurious test output in Distutils (test_clean).
+
+- Issue #1326077: fix the formatting of SyntaxErrors by the traceback module.
+
- Issue #1665206 (partially): Move imports in cgitb to the top of the module
instead of performing them in functions. Helps prevent import deadlocking in
threads.
@@ -465,7 +481,7 @@
operator module; use the abstract base classes instead. Also removed
the repeat() function; use mul() instead.
-- Issue 5021: doctest.testfile() did not create __name__ and
+- Issue #5021: doctest.testfile() did not create __name__ and
collections.namedtuple() relied on __name__ being defined.
- Backport importlib from Python 3.1. Only the import_module() function has
@@ -479,7 +495,7 @@
- Added a new itertools functions: combinations_with_replacement()
and compress().
-- Issue 5032: added a step argument to itertools.count() and
+- Issue #5032: added a step argument to itertools.count() and
allowed non-integer arguments.
- Fix and properly document the multiprocessing module's logging
@@ -566,7 +582,7 @@
- Issue #4812: add missing underscore prefix to some internal-use-only
constants in the decimal module. (Dec_0 becomes _Dec_0, etc.)
-- Issue 4790: The nsmallest() and nlargest() functions in the heapq module
+- Issue #4790: The nsmallest() and nlargest() functions in the heapq module
did unnecessary work in the common case where no key function was specified.
- Issue #4795: inspect.isgeneratorfunction() returns False instead of None when
Modified: python/branches/py3k-short-float-repr/Misc/developers.txt
==============================================================================
--- python/branches/py3k-short-float-repr/Misc/developers.txt (original)
+++ python/branches/py3k-short-float-repr/Misc/developers.txt Mon Apr 6 00:11:42 2009
@@ -17,6 +17,18 @@
Permissions History
-------------------
+- Paul Kippes was given commit privileges at PyCon 2009 by BAC to work on 3to2.
+
+- Ron DuPlain was given commit privileges at PyCon 2009 by BAC to work on 3to2.
+
+- Several developers of alternative Python implementations where
+ given access for test suite and library adaptions by MvL:
+ Allison Randal (Parrot), Michael Foord (IronPython),
+ Jim Baker, Philip Jenvey, and Frank Wierzbicki (all Jython).
+
+- R. David Murray was given SVN access on March 30 2009 by MvL, after
+ recommendation by BAC.
+
- Chris Withers was given SVN access on March 8 2009 by MvL,
after recommendation by GvR.
@@ -244,10 +256,11 @@
Initials of Project Admins
--------------------------
-GvR: Guido van Rossum
-NCN: Neal Norwitz
-RDH: Raymond Hettinger
TGP: Tim Peters
+GFB: Georg Brandl
+BAC: Brett Cannon
+NCN: Neal Norwitz
DJG: David Goodger
MvL: Martin v. Loewis
-GFB: Georg Brandl
+GvR: Guido van Rossum
+RDH: Raymond Hettinger
Modified: python/branches/py3k-short-float-repr/Modules/_io/_iomodule.c
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_io/_iomodule.c (original)
+++ python/branches/py3k-short-float-repr/Modules/_io/_iomodule.c Mon Apr 6 00:11:42 2009
@@ -60,7 +60,7 @@
"allowed to throw an IOError if they do not support a given operation.\n"
"\n"
"Extending IOBase is RawIOBase which deals simply with the reading and\n"
-"writing of raw bytes to a stream. FileIO subc lasses RawIOBase to provide\n"
+"writing of raw bytes to a stream. FileIO subclasses RawIOBase to provide\n"
"an interface to OS files.\n"
"\n"
"BufferedIOBase deals with buffering on a raw byte stream (RawIOBase). Its\n"
Modified: python/branches/py3k-short-float-repr/Modules/_io/bufferedio.c
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_io/bufferedio.c (original)
+++ python/branches/py3k-short-float-repr/Modules/_io/bufferedio.c Mon Apr 6 00:11:42 2009
@@ -204,7 +204,9 @@
isn't ready for writing. */
Py_off_t write_end;
+#ifdef WITH_THREAD
PyThread_type_lock lock;
+#endif
Py_ssize_t buffer_size;
Py_ssize_t buffer_mask;
@@ -239,6 +241,7 @@
/* These macros protect the BufferedObject against concurrent operations. */
+#ifdef WITH_THREAD
#define ENTER_BUFFERED(self) \
Py_BEGIN_ALLOW_THREADS \
PyThread_acquire_lock(self->lock, 1); \
@@ -246,6 +249,10 @@
#define LEAVE_BUFFERED(self) \
PyThread_release_lock(self->lock);
+#else
+#define ENTER_BUFFERED(self)
+#define LEAVE_BUFFERED(self)
+#endif
#define CHECK_INITIALIZED(self) \
if (self->ok <= 0) { \
@@ -305,10 +312,12 @@
PyMem_Free(self->buffer);
self->buffer = NULL;
}
+#ifdef WITH_THREAD
if (self->lock) {
PyThread_free_lock(self->lock);
self->lock = NULL;
}
+#endif
Py_CLEAR(self->dict);
Py_TYPE(self)->tp_free((PyObject *)self);
}
@@ -565,11 +574,13 @@
PyErr_NoMemory();
return -1;
}
+#ifdef WITH_THREAD
self->lock = PyThread_allocate_lock();
if (self->lock == NULL) {
PyErr_SetString(PyExc_RuntimeError, "can't allocate read lock");
return -1;
}
+#endif
/* Find out whether buffer_size is a power of 2 */
/* XXX is this optimization useful? */
for (n = self->buffer_size - 1; n & 1; n >>= 1)
Modified: python/branches/py3k-short-float-repr/Modules/_multiprocessing/connection.h
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_multiprocessing/connection.h (original)
+++ python/branches/py3k-short-float-repr/Modules/_multiprocessing/connection.h Mon Apr 6 00:11:42 2009
@@ -139,8 +139,12 @@
res = conn_send_string(self, buffer + offset, size);
PyBuffer_Release(&pbuffer);
- if (res < 0)
- return mp_SetError(PyExc_IOError, res);
+ if (res < 0) {
+ if (PyErr_Occurred())
+ return NULL;
+ else
+ return mp_SetError(PyExc_IOError, res);
+ }
Py_RETURN_NONE;
}
Modified: python/branches/py3k-short-float-repr/Modules/_multiprocessing/multiprocessing.c
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_multiprocessing/multiprocessing.c (original)
+++ python/branches/py3k-short-float-repr/Modules/_multiprocessing/multiprocessing.c Mon Apr 6 00:11:42 2009
@@ -8,6 +8,12 @@
#include "multiprocessing.h"
+#ifdef SCM_RIGHTS
+ #define HAVE_FD_TRANSFER 1
+#else
+ #define HAVE_FD_TRANSFER 0
+#endif
+
PyObject *create_win32_namespace(void);
PyObject *pickle_dumps, *pickle_loads, *pickle_protocol;
@@ -257,7 +263,7 @@
Py_INCREF(&ConnectionType);
PyModule_AddObject(module, "Connection", (PyObject*)&ConnectionType);
-#if defined(MS_WINDOWS) || HAVE_SEM_OPEN
+#if defined(MS_WINDOWS) || defined(HAVE_SEM_OPEN)
/* Add SemLock type to module */
if (PyType_Ready(&SemLockType) < 0)
return NULL;
Modified: python/branches/py3k-short-float-repr/Modules/_multiprocessing/multiprocessing.h
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_multiprocessing/multiprocessing.h (original)
+++ python/branches/py3k-short-float-repr/Modules/_multiprocessing/multiprocessing.h Mon Apr 6 00:11:42 2009
@@ -27,7 +27,7 @@
# include <sys/socket.h>
# include <sys/uio.h>
# include <arpa/inet.h> /* htonl() and ntohl() */
-# if HAVE_SEM_OPEN
+# ifdef HAVE_SEM_OPEN
# include <semaphore.h>
typedef sem_t *SEM_HANDLE;
# endif
@@ -45,13 +45,18 @@
* Issue 3110 - Solaris does not define SEM_VALUE_MAX
*/
#ifndef SEM_VALUE_MAX
-# ifdef _SEM_VALUE_MAX
-# define SEM_VALUE_MAX _SEM_VALUE_MAX
-# else
-# define SEM_VALUE_MAX INT_MAX
-# endif
+ #if defined(HAVE_SYSCONF) && defined(_SC_SEM_VALUE_MAX)
+ # define SEM_VALUE_MAX sysconf(_SC_SEM_VALUE_MAX)
+ #elif defined(_SEM_VALUE_MAX)
+ # define SEM_VALUE_MAX _SEM_VALUE_MAX
+ #elif definef(_POSIX_SEM_VALUE_MAX)
+ # define SEM_VALUE_MAX _POSIX_SEM_VALUE_MAX
+ #else
+ # define SEM_VALUE_MAX INT_MAX
+ #endif
#endif
+
/*
* Make sure Py_ssize_t available
*/
Modified: python/branches/py3k-short-float-repr/Modules/_multiprocessing/pipe_connection.c
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_multiprocessing/pipe_connection.c (original)
+++ python/branches/py3k-short-float-repr/Modules/_multiprocessing/pipe_connection.c Mon Apr 6 00:11:42 2009
@@ -23,6 +23,12 @@
Py_BEGIN_ALLOW_THREADS
ret = WriteFile(conn->handle, string, length, &amount_written, NULL);
Py_END_ALLOW_THREADS
+
+ if (ret == 0 && GetLastError() == ERROR_NO_SYSTEM_RESOURCES) {
+ PyErr_Format(PyExc_ValueError, "Cannnot send %" PY_FORMAT_SIZE_T "d bytes over connection", length);
+ return MP_STANDARD_ERROR;
+ }
+
return ret ? MP_SUCCESS : MP_STANDARD_ERROR;
}
Modified: python/branches/py3k-short-float-repr/Modules/_multiprocessing/semaphore.c
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_multiprocessing/semaphore.c (original)
+++ python/branches/py3k-short-float-repr/Modules/_multiprocessing/semaphore.c Mon Apr 6 00:11:42 2009
@@ -197,11 +197,11 @@
#define SEM_GETVALUE(sem, pval) sem_getvalue(sem, pval)
#define SEM_UNLINK(name) sem_unlink(name)
-#if HAVE_BROKEN_SEM_UNLINK
+#ifndef HAVE_SEM_UNLINK
# define sem_unlink(name) 0
#endif
-#if !HAVE_SEM_TIMEDWAIT
+#ifndef HAVE_SEM_TIMEDWAIT
# define sem_timedwait(sem,deadline) sem_timedwait_save(sem,deadline,_save)
int
@@ -348,7 +348,7 @@
}
assert(self->count == 1);
} else {
-#if HAVE_BROKEN_SEM_GETVALUE
+#ifdef HAVE_BROKEN_SEM_GETVALUE
/* We will only check properly the maxvalue == 1 case */
if (self->maxvalue == 1) {
/* make sure that already locked */
@@ -494,7 +494,7 @@
static PyObject *
semlock_getvalue(SemLockObject *self)
{
-#if HAVE_BROKEN_SEM_GETVALUE
+#ifdef HAVE_BROKEN_SEM_GETVALUE
PyErr_SetNone(PyExc_NotImplementedError);
return NULL;
#else
@@ -512,7 +512,7 @@
static PyObject *
semlock_iszero(SemLockObject *self)
{
-#if HAVE_BROKEN_SEM_GETVALUE
+#ifdef HAVE_BROKEN_SEM_GETVALUE
if (sem_trywait(self->handle) < 0) {
if (errno == EAGAIN)
Py_RETURN_TRUE;
Modified: python/branches/py3k-short-float-repr/Modules/_sqlite/connection.c
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_sqlite/connection.c (original)
+++ python/branches/py3k-short-float-repr/Modules/_sqlite/connection.c Mon Apr 6 00:11:42 2009
@@ -124,8 +124,9 @@
self->detect_types = detect_types;
self->timeout = timeout;
(void)sqlite3_busy_timeout(self->db, (int)(timeout*1000));
-
+#ifdef WITH_THREAD
self->thread_ident = PyThread_get_thread_ident();
+#endif
self->check_same_thread = check_same_thread;
self->function_pinboard = PyDict_New();
@@ -510,9 +511,11 @@
PyObject* py_func;
PyObject* py_retval = NULL;
+#ifdef WITH_THREAD
PyGILState_STATE threadstate;
threadstate = PyGILState_Ensure();
+#endif
py_func = (PyObject*)sqlite3_user_data(context);
@@ -534,7 +537,9 @@
_sqlite3_result_error(context, "user-defined function raised exception", -1);
}
+#ifdef WITH_THREAD
PyGILState_Release(threadstate);
+#endif
}
static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_value** params)
@@ -545,9 +550,11 @@
PyObject** aggregate_instance;
PyObject* stepmethod = NULL;
+#ifdef WITH_THREAD
PyGILState_STATE threadstate;
threadstate = PyGILState_Ensure();
+#endif
aggregate_class = (PyObject*)sqlite3_user_data(context);
@@ -594,7 +601,9 @@
Py_XDECREF(stepmethod);
Py_XDECREF(function_result);
+#ifdef WITH_THREAD
PyGILState_Release(threadstate);
+#endif
}
void _pysqlite_final_callback(sqlite3_context* context)
@@ -603,9 +612,11 @@
PyObject** aggregate_instance;
PyObject* aggregate_class;
+#ifdef WITH_THREAD
PyGILState_STATE threadstate;
threadstate = PyGILState_Ensure();
+#endif
aggregate_class = (PyObject*)sqlite3_user_data(context);
@@ -633,7 +644,9 @@
Py_XDECREF(*aggregate_instance);
Py_XDECREF(function_result);
+#ifdef WITH_THREAD
PyGILState_Release(threadstate);
+#endif
}
void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
@@ -728,9 +741,11 @@
{
PyObject *ret;
int rc;
+#ifdef WITH_THREAD
PyGILState_STATE gilstate;
gilstate = PyGILState_Ensure();
+#endif
ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source);
if (!ret) {
@@ -750,7 +765,9 @@
Py_DECREF(ret);
}
+#ifdef WITH_THREAD
PyGILState_Release(gilstate);
+#endif
return rc;
}
@@ -758,9 +775,11 @@
{
int rc;
PyObject *ret;
+#ifdef WITH_THREAD
PyGILState_STATE gilstate;
gilstate = PyGILState_Ensure();
+#endif
ret = PyObject_CallFunction((PyObject*)user_arg, "");
if (!ret) {
@@ -777,7 +796,9 @@
Py_DECREF(ret);
}
+#ifdef WITH_THREAD
PyGILState_Release(gilstate);
+#endif
return rc;
}
@@ -832,6 +853,7 @@
int pysqlite_check_thread(pysqlite_Connection* self)
{
+#ifdef WITH_THREAD
if (self->check_same_thread) {
if (PyThread_get_thread_ident() != self->thread_ident) {
PyErr_Format(pysqlite_ProgrammingError,
@@ -842,7 +864,7 @@
}
}
-
+#endif
return 1;
}
@@ -1067,12 +1089,14 @@
PyObject* callback = (PyObject*)context;
PyObject* string1 = 0;
PyObject* string2 = 0;
+#ifdef WITH_THREAD
PyGILState_STATE gilstate;
-
+#endif
PyObject* retval = NULL;
int result = 0;
-
+#ifdef WITH_THREAD
gilstate = PyGILState_Ensure();
+#endif
if (PyErr_Occurred()) {
goto finally;
@@ -1101,9 +1125,9 @@
Py_XDECREF(string1);
Py_XDECREF(string2);
Py_XDECREF(retval);
-
+#ifdef WITH_THREAD
PyGILState_Release(gilstate);
-
+#endif
return result;
}
Modified: python/branches/py3k-short-float-repr/Modules/_sqlite/module.c
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_sqlite/module.c (original)
+++ python/branches/py3k-short-float-repr/Modules/_sqlite/module.c Mon Apr 6 00:11:42 2009
@@ -459,7 +459,9 @@
* threads have already been initialized.
* (see pybsddb-users mailing list post on 2002-08-07)
*/
+#ifdef WITH_THREAD
PyEval_InitThreads();
+#endif
error:
if (PyErr_Occurred())
Modified: python/branches/py3k-short-float-repr/Modules/_tkinter.c
==============================================================================
--- python/branches/py3k-short-float-repr/Modules/_tkinter.c (original)
+++ python/branches/py3k-short-float-repr/Modules/_tkinter.c Mon Apr 6 00:11:42 2009
@@ -281,7 +281,7 @@
static PyObject *trbInCmd;
#ifdef TKINTER_PROTECT_LOADTK
-static int tk_load_failed;
+static int tk_load_failed = 0;
#endif
Modified: python/branches/py3k-short-float-repr/Objects/genobject.c
==============================================================================
--- python/branches/py3k-short-float-repr/Objects/genobject.c (original)
+++ python/branches/py3k-short-float-repr/Objects/genobject.c Mon Apr 6 00:11:42 2009
@@ -304,7 +304,7 @@
"Return the name of the generator's associated code object.");
static PyGetSetDef gen_getsetlist[] = {
- {"__name__", (getter)gen_get_name, NULL, NULL, gen__name__doc__},
+ {"__name__", (getter)gen_get_name, NULL, gen__name__doc__},
{NULL}
};
Modified: python/branches/py3k-short-float-repr/Objects/object.c
==============================================================================
--- python/branches/py3k-short-float-repr/Objects/object.c (original)
+++ python/branches/py3k-short-float-repr/Objects/object.c Mon Apr 6 00:11:42 2009
@@ -349,11 +349,17 @@
if (op == NULL)
fprintf(stderr, "NULL\n");
else {
+#ifdef WITH_THREAD
PyGILState_STATE gil;
+#endif
fprintf(stderr, "object : ");
+#ifdef WITH_THREAD
gil = PyGILState_Ensure();
+#endif
(void)PyObject_Print(op, stderr, 0);
+#ifdef WITH_THREAD
PyGILState_Release(gil);
+#endif
/* XXX(twouters) cast refcount to long until %zd is
universally available */
fprintf(stderr, "\n"
Modified: python/branches/py3k-short-float-repr/configure
==============================================================================
--- python/branches/py3k-short-float-repr/configure (original)
+++ python/branches/py3k-short-float-repr/configure Mon Apr 6 00:11:42 2009
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 70732 .
+# From configure.in Revision: 71261 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1.
#
@@ -1804,6 +1804,11 @@
+if test "$prefix" != "/"; then
+ prefix=`echo "$prefix" | sed -e 's/\/$//g'`
+fi
+
+
@@ -16329,6 +16334,10 @@
+
+
+
+
for ac_func in alarm setitimer getitimer bind_textdomain_codeset chown \
clock confstr ctermid execv fchmod fchown fork fpathconf ftime ftruncate \
gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
@@ -16336,7 +16345,8 @@
kill killpg lchmod lchown lstat mkfifo mknod mktime \
mremap nice pathconf pause plock poll pthread_init \
putenv readlink realpath \
- select setegid seteuid setgid \
+ select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \
+ setgid \
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
sigaction siginterrupt sigrelse strftime strlcpy \
sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
@@ -21757,6 +21767,86 @@
fi
+# Multiprocessing check for broken sem_getvalue
+{ echo "$as_me:$LINENO: checking for broken sem_getvalue" >&5
+echo $ECHO_N "checking for broken sem_getvalue... $ECHO_C" >&6; }
+if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <semaphore.h>
+#include <sys/stat.h>
+
+int main(void){
+ sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
+ int count;
+ int res;
+ if(a==SEM_FAILED){
+ perror("sem_open");
+ return 1;
+
+ }
+ res = sem_getvalue(a, &count);
+ sem_close(a);
+ return res==-1 ? 1 : 0;
+}
+
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_BROKEN_SEM_GETVALUE 1
+_ACEOF
+
+
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
# On FreeBSD 6.2, it appears that tanh(-0.) returns 0. instead of
# -0. on some architectures.
Modified: python/branches/py3k-short-float-repr/configure.in
==============================================================================
--- python/branches/py3k-short-float-repr/configure.in (original)
+++ python/branches/py3k-short-float-repr/configure.in Mon Apr 6 00:11:42 2009
@@ -12,6 +12,15 @@
AC_CONFIG_SRCDIR([Include/object.h])
AC_CONFIG_HEADER(pyconfig.h)
+dnl Ensure that if prefix is specified, it does not end in a slash. If
+dnl it does, we get path names containing '//' which is both ugly and
+dnl can cause trouble.
+
+dnl Last slash shouldn't be stripped if prefix=/
+if test "$prefix" != "/"; then
+ prefix=`echo "$prefix" | sed -e 's/\/$//g'`
+fi
+
dnl This is for stuff that absolutely must end up in pyconfig.h.
dnl Please use pyport.h instead, if possible.
AH_TOP([
@@ -2405,7 +2414,8 @@
kill killpg lchmod lchown lstat mkfifo mknod mktime \
mremap nice pathconf pause plock poll pthread_init \
putenv readlink realpath \
- select setegid seteuid setgid \
+ select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \
+ setgid \
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
sigaction siginterrupt sigrelse strftime strlcpy \
sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
@@ -3125,6 +3135,33 @@
[Define if arithmetic is subject to x87-style double rounding issue])
fi
+# Multiprocessing check for broken sem_getvalue
+AC_MSG_CHECKING(for broken sem_getvalue)
+AC_TRY_RUN([
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <semaphore.h>
+#include <sys/stat.h>
+
+int main(void){
+ sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
+ int count;
+ int res;
+ if(a==SEM_FAILED){
+ perror("sem_open");
+ return 1;
+
+ }
+ res = sem_getvalue(a, &count);
+ sem_close(a);
+ return res==-1 ? 1 : 0;
+}
+]
+,AC_MSG_RESULT(no),
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_BROKEN_SEM_GETVALUE, 1, define to 1 if your sem_getvalue is broken.)
+)
# On FreeBSD 6.2, it appears that tanh(-0.) returns 0. instead of
# -0. on some architectures.
Modified: python/branches/py3k-short-float-repr/pyconfig.h.in
==============================================================================
--- python/branches/py3k-short-float-repr/pyconfig.h.in (original)
+++ python/branches/py3k-short-float-repr/pyconfig.h.in Mon Apr 6 00:11:42 2009
@@ -74,6 +74,9 @@
/* Define if pthread_sigmask() does not work on your system. */
#undef HAVE_BROKEN_PTHREAD_SIGMASK
+/* define to 1 if your sem_getvalue is broken. */
+#undef HAVE_BROKEN_SEM_GETVALUE
+
/* Define this if you have the type _Bool. */
#undef HAVE_C99_BOOL
@@ -505,6 +508,18 @@
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
+/* Define to 1 if you have the `sem_getvalue' function. */
+#undef HAVE_SEM_GETVALUE
+
+/* Define to 1 if you have the `sem_open' function. */
+#undef HAVE_SEM_OPEN
+
+/* Define to 1 if you have the `sem_timedwait' function. */
+#undef HAVE_SEM_TIMEDWAIT
+
+/* Define to 1 if you have the `sem_unlink' function. */
+#undef HAVE_SEM_UNLINK
+
/* Define to 1 if you have the `setegid' function. */
#undef HAVE_SETEGID
Modified: python/branches/py3k-short-float-repr/setup.py
==============================================================================
--- python/branches/py3k-short-float-repr/setup.py (original)
+++ python/branches/py3k-short-float-repr/setup.py Mon Apr 6 00:11:42 2009
@@ -988,56 +988,29 @@
libraries = ['ws2_32']
elif platform == 'darwin': # Mac OSX
- macros = dict(
- HAVE_SEM_OPEN=1,
- HAVE_SEM_TIMEDWAIT=0,
- HAVE_FD_TRANSFER=1,
- HAVE_BROKEN_SEM_GETVALUE=1
- )
+ macros = dict()
libraries = []
elif platform == 'cygwin': # Cygwin
- macros = dict(
- HAVE_SEM_OPEN=1,
- HAVE_SEM_TIMEDWAIT=1,
- HAVE_FD_TRANSFER=0,
- HAVE_BROKEN_SEM_UNLINK=1
- )
+ macros = dict()
libraries = []
elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
# FreeBSD's P1003.1b semaphore support is very experimental
# and has many known problems. (as of June 2008)
- macros = dict( # FreeBSD
- HAVE_SEM_OPEN=0,
- HAVE_SEM_TIMEDWAIT=0,
- HAVE_FD_TRANSFER=1,
- )
+ macros = dict()
libraries = []
elif platform.startswith('openbsd'):
- macros = dict( # OpenBSD
- HAVE_SEM_OPEN=0, # Not implemented
- HAVE_SEM_TIMEDWAIT=0,
- HAVE_FD_TRANSFER=1,
- )
+ macros = dict()
libraries = []
elif platform.startswith('netbsd'):
- macros = dict( # at least NetBSD 5
- HAVE_SEM_OPEN=1,
- HAVE_SEM_TIMEDWAIT=0,
- HAVE_FD_TRANSFER=1,
- HAVE_BROKEN_SEM_GETVALUE=1
- )
+ macros = dict()
libraries = []
else: # Linux and other unices
- macros = dict(
- HAVE_SEM_OPEN=1,
- HAVE_SEM_TIMEDWAIT=1,
- HAVE_FD_TRANSFER=1
- )
+ macros = dict()
libraries = ['rt']
if platform == 'win32':
@@ -1052,8 +1025,7 @@
multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
'_multiprocessing/socket_connection.c'
]
-
- if macros.get('HAVE_SEM_OPEN', False):
+ if sysconfig.get_config_var('HAVE_SEM_OPEN'):
multiprocessing_srcs.append('_multiprocessing/semaphore.c')
if sysconfig.get_config_var('WITH_THREAD'):
More information about the Python-checkins
mailing list