Merged revisions 77593,77702-77703,77858,77887,78113-78115,78117,78245,78385-78386,78496,78760,78771-78773,78802 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77593 | georg.brandl | 2010-01-18 00:33:53 +0100 (Mo, 18 Jan 2010) | 1 line
Fix internal reference.
........
r77702 | georg.brandl | 2010-01-23 09:43:31 +0100 (Sa, 23 Jan 2010) | 1 line
#7762: fix refcount annotation of PyUnicode_Tailmatch().
........
r77703 | georg.brandl | 2010-01-23 09:47:54 +0100 (Sa, 23 Jan 2010) | 1 line
#7725: fix referencing issue.
........
r77858 | georg.brandl | 2010-01-30 18:57:48 +0100 (Sa, 30 Jan 2010) | 1 line
#7802: fix invalid example (heh).
........
r77887 | georg.brandl | 2010-01-31 19:51:49 +0100 (So, 31 Jan 2010) | 5 lines
Fix-up ftplib documentation:
move exception descriptions to toplevel, not inside a class
remove attribution in "versionadded"
spell and grammar check docstring of FTP_TLS
........
r78113 | georg.brandl | 2010-02-08 23:37:20 +0100 (Mo, 08 Feb 2010) | 1 line
Fix missing string formatting argument.
........
r78114 | georg.brandl | 2010-02-08 23:37:52 +0100 (Mo, 08 Feb 2010) | 1 line
Fix undefined local.
........
r78115 | georg.brandl | 2010-02-08 23:40:51 +0100 (Mo, 08 Feb 2010) | 1 line
Fix missing string formatting placeholder.
........
r78117 | georg.brandl | 2010-02-08 23:48:37 +0100 (Mo, 08 Feb 2010) | 1 line
Convert test failure from output-producing to self.fail().
........
r78245 | georg.brandl | 2010-02-19 20:36:08 +0100 (Fr, 19 Feb 2010) | 1 line
#7967: PyXML is no more.
........
r78385 | georg.brandl | 2010-02-23 22:33:17 +0100 (Di, 23 Feb 2010) | 1 line
#8000: fix deprecated directive. What a shame to lose that glorious issue number to such a minor bug :)
........
r78386 | georg.brandl | 2010-02-23 22:48:57 +0100 (Di, 23 Feb 2010) | 1 line
#6544: fix refleak in kqueue, occurring in certain error conditions.
........
r78496 | georg.brandl | 2010-02-27 15:58:08 +0100 (Sa, 27 Feb 2010) | 1 line
Link to http://www.python.org/dev/workflow/ from bugs page.
........
r78760 | georg.brandl | 2010-03-07 16:23:59 +0100 (So, 07 Mär 2010) | 1 line
#5341: more built-in vs builtin fixes.
........
r78771 | georg.brandl | 2010-03-07 21:58:31 +0100 (So, 07 Mär 2010) | 1 line
#8085: The function is called PyObject_NewVar, not PyObject_VarNew.
........
r78772 | georg.brandl | 2010-03-07 22:12:28 +0100 (So, 07 Mär 2010) | 1 line
#8039: document conditional expressions better, giving them their own section.
........
r78773 | georg.brandl | 2010-03-07 22:32:06 +0100 (So, 07 Mär 2010) | 1 line
#8044: document Py_{Enter,Leave}RecursiveCall functions.
........
r78802 | georg.brandl | 2010-03-08 17:28:40 +0100 (Mo, 08 Mär 2010) | 1 line
Fix typo.
........
diff --git a/Misc/BeOS-setup.py b/Misc/BeOS-setup.py
index 0043a34..c5e02cc 100644
--- a/Misc/BeOS-setup.py
+++ b/Misc/BeOS-setup.py
@@ -195,7 +195,7 @@
libraries=math_libs) )
# operator.add() and similar goodies
exts.append( Extension('operator', ['operator.c']) )
- # access to the builtin codecs and codec registry
+ # access to the built-in codecs and codec registry
exts.append( Extension('_codecs', ['_codecsmodule.c']) )
# Python C API test module
exts.append( Extension('_testcapi', ['_testcapimodule.c']) )
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 127b782..ab1b1ec 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -1154,7 +1154,7 @@
- Bug #1244610, #1392915, fix build problem on OpenBSD 3.7 and 3.8.
configure would break checking curses.h.
-- Bug #959576: The pwd module is now builtin. This allows Python to be
+- Bug #959576: The pwd module is now built in. This allows Python to be
built on UNIX platforms without $HOME set.
- Bug #1072182, fix some potential problems if characters are signed.
@@ -1187,7 +1187,7 @@
it will now use a default error message in this case.
- Replaced most Unicode charmap codecs with new ones using the
- new Unicode translate string feature in the builtin charmap
+ new Unicode translate string feature in the built-in charmap
codec; the codecs were created from the mapping tables available
at ftp.unicode.org and contain a few updates (e.g. the Mac OS
encodings now include a mapping for the Apple logo)
@@ -1642,7 +1642,7 @@
current file number.
- Patch #1349274: gettext.install() now optionally installs additional
- translation functions other than _() in the builtin namespace.
+ translation functions other than _() in the builtins namespace.
- Patch #1337756: fileinput now accepts Unicode filenames.
@@ -2013,7 +2013,7 @@
- Patch #881820: look for openpty and forkpty also in libbsd.
- The sources of zlib are now part of the Python distribution (zlib 1.2.3).
- The zlib module is now builtin on Windows.
+ The zlib module is now built in on Windows.
- Use -xcode=pic32 for CCSHARED on Solaris with SunPro.
@@ -2848,7 +2848,7 @@
- Patch #846659. Fix an error in tarfile.py when using
GNU longname/longlink creation.
-- The obsolete FCNTL.py has been deleted. The builtin fcntl module
+- The obsolete FCNTL.py has been deleted. The built-in fcntl module
has been available (on platforms that support fcntl) since Python
1.5a3, and all FCNTL.py did is export fcntl's names, after generating
a deprecation warning telling you to use fcntl directly.
@@ -3102,7 +3102,7 @@
segfault in a debug build, but provided less predictable behavior in
a release build.
-- input() builtin function now respects compiler flags such as
+- input() built-in function now respects compiler flags such as
__future__ statements. SF patch 876178.
- Removed PendingDeprecationWarning from apply(). apply() remains
@@ -3163,12 +3163,12 @@
- Compiler flags set in PYTHONSTARTUP are now active in __main__.
-- Added two builtin types, set() and frozenset().
+- Added two built-in types, set() and frozenset().
-- Added a reversed() builtin function that returns a reverse iterator
+- Added a reversed() built-in function that returns a reverse iterator
over a sequence.
-- Added a sorted() builtin function that returns a new sorted list
+- Added a sorted() built-in function that returns a new sorted list
from any iterable.
- CObjects are now mutable (on the C level) through PyCObject_SetVoidPtr.
@@ -3207,7 +3207,7 @@
When comparing containers with cyclic references to themselves it
will now just hit the recursion limit. See SF patch 825639.
-- str and unicode builtin types now have an rsplit() method that is
+- str and unicode built-in types now have an rsplit() method that is
same as split() except that it scans the string from the end
working towards the beginning. See SF feature request 801847.
@@ -3758,7 +3758,7 @@
- A warning about assignments to module attributes that shadow
builtins, present in earlier releases of 2.3, has been removed.
-- It is not possible to create subclasses of builtin types like str
+- It is not possible to create subclasses of built-in types like str
and tuple that define an itemsize. Earlier releases of Python 2.3
allowed this by mistake, leading to crashes and other problems.
@@ -4233,13 +4233,13 @@
- New format codes B, H, I, k and K have been implemented for
PyArg_ParseTuple and PyBuild_Value.
-- New builtin function sum(seq, start=0) returns the sum of all the
+- New built-in function sum(seq, start=0) returns the sum of all the
items in iterable object seq, plus start (items are normally numbers,
and cannot be strings).
- bool() called without arguments now returns False rather than
raising an exception. This is consistent with calling the
- constructors for the other builtin types -- called without argument
+ constructors for the other built-in types -- called without argument
they all return the false value of that type. (SF patch #724135)
- In support of PEP 269 (making the pgen parser generator accessible
@@ -4764,7 +4764,7 @@
internals, and supplies some helpers for working with pickles, such as
a symbolic pickle disassembler.
-- Xmlrpclib.py now supports the builtin boolean type.
+- xmlrpclib.py now supports the built-in boolean type.
- py_compile has a new 'doraise' flag and a new PyCompileError
exception.
@@ -5015,8 +5015,8 @@
trace function to change which line will execute next. A command to
exploit this from pdb has been added. [SF patch #643835]
-- The _codecs support module for codecs.py was turned into a builtin
- module to assure that at least the builtin codecs are available
+- The _codecs support module for codecs.py was turned into a built-in
+ module to assure that at least the built-in codecs are available
to the Python parser for source code decoding according to PEP 263.
- issubclass now supports a tuple as the second argument, just like
@@ -5174,13 +5174,13 @@
- Unicode objects in sys.path are no longer ignored but treated
as directory names.
-- Fixed string.startswith and string.endswith builtin methods
+- Fixed string.startswith and string.endswith built-in methods
so they accept negative indices. [SF bug 493951]
- Fixed a bug with a continue inside a try block and a yield in the
finally clause. [SF bug 567538]
-- Most builtin sequences now support "extended slices", i.e. slices
+- Most built-in sequences now support "extended slices", i.e. slices
with a third "stride" parameter. For example, "hello world"[::-1]
gives "dlrow olleh".
@@ -5195,7 +5195,7 @@
method no longer exist. xrange repetition and slicing have been
removed.
-- New builtin function enumerate(x), from PEP 279. Example:
+- New built-in function enumerate(x), from PEP 279. Example:
enumerate("abc") is an iterator returning (0,"a"), (1,"b"), (2,"c").
The argument can be an arbitrary iterable object.
@@ -5744,7 +5744,7 @@
Presumably 2.3a1 breaks such systems. If anyone uses such a system, help!
- The configure option --without-doc-strings can be used to remove the
- doc strings from the builtin functions and modules; this reduces the
+ doc strings from the built-in functions and modules; this reduces the
size of the executable.
- The universal newlines option (PEP 278) is on by default. On Unix
@@ -5980,7 +5980,7 @@
available for convenience.
- New Carbon modules File (implementing the APIs in Files.h and Aliases.h)
- and Folder (APIs from Folders.h). The old macfs builtin module is
+ and Folder (APIs from Folders.h). The old macfs built-in module is
gone, and replaced by a Python wrapper around the new modules.
- Pathname handling should now be fully consistent: MacPython-OSX always uses
@@ -6202,7 +6202,7 @@
C API
-----
-- New function PyDict_MergeFromSeq2() exposes the builtin dict
+- New function PyDict_MergeFromSeq2() exposes the built-in dict
constructor's logic for updating a dictionary from an iterable object
producing key-value pairs.
@@ -6253,7 +6253,7 @@
using new-style MRO rules if any base class is a new-style class.
This needs to be documented.
-- The new builtin dictionary() constructor, and dictionary type, have
+- The new built-in dictionary() constructor, and dictionary type, have
been renamed to dict. This reflects a decade of common usage.
- dict() now accepts an iterable object producing 2-sequences. For
@@ -6708,9 +6708,9 @@
The new class must have the same C-level object layout as the old
class.
-- The builtin file type can be subclassed now. In the usual pattern,
- "file" is the name of the builtin type, and file() is a new builtin
- constructor, with the same signature as the builtin open() function.
+- The built-in file type can be subclassed now. In the usual pattern,
+ "file" is the name of the built-in type, and file() is a new built-in
+ constructor, with the same signature as the built-in open() function.
file() is now the preferred way to open a file.
- Previously, __new__ would only see sequential arguments passed to
@@ -6724,7 +6724,7 @@
- Previously, an operation on an instance of a subclass of an
immutable type (int, long, float, complex, tuple, str, unicode),
where the subtype didn't override the operation (and so the
- operation was handled by the builtin type), could return that
+ operation was handled by the built-in type), could return that
instance instead a value of the base type. For example, if s was of
a str subclass type, s[:] returned s as-is. Now it returns a str
with the same value as s.
@@ -6772,7 +6772,7 @@
called for each iteration until it returns an empty string).
- The codecs module has grown four new helper APIs to access
- builtin codecs: getencoder(), getdecoder(), getreader(),
+ built-in codecs: getencoder(), getdecoder(), getreader(),
getwriter().
- SimpleXMLRPCServer: a new module (based upon SimpleHTMLServer)
@@ -7902,7 +7902,7 @@
In all previous version of Python, names were resolved in exactly
three namespaces -- the local namespace, the global namespace, and
- the builtin namespace. According to this old definition, if a
+ the builtins namespace. According to this old definition, if a
function A is defined within a function B, the names bound in B are
not visible in A. The new rules make names bound in B visible in A,
unless A contains a name binding that hides the binding in B.
@@ -7923,7 +7923,7 @@
return str.strip()
Under the old rules, the name str in helper() is bound to the
- builtin function str(). Under the new rules, it will be bound to
+ built-in function str(). Under the new rules, it will be bound to
the argument named str and an error will occur when helper() is
called.
@@ -8421,7 +8421,7 @@
assignment, e.g. +=, was fixed.
- Raise ZeroDivisionError when raising zero to a negative number,
- e.g. 0.0 ** -2.0. Note that math.pow is unrelated to the builtin
+ e.g. 0.0 ** -2.0. Note that math.pow is unrelated to the built-in
power operator and the result of math.pow(0.0, -2.0) will vary by
platform. On Linux, it raises a ValueError.
@@ -12671,7 +12671,7 @@
overriding modules with the same name.
- Fixed some strange exceptions in __del__ methods in library modules
-(e.g. urllib). This happens because the builtin names are already
+(e.g. urllib). This happens because the built-in names are already
deleted by the time __del__ is called. The solution (a hack, but it
works) is to set some instance variables to 0 instead of None.
@@ -13374,8 +13374,8 @@
f(a=1,a=2) is now a syntax error.
-Changes to builtin features
----------------------------
+Changes to built-in features
+----------------------------
- There's a new exception FloatingPointError (used only by Lee Busby's
patches to catch floating point exceptions, at the moment).
@@ -14675,7 +14675,7 @@
- New modules: errno, operator (XXX).
-- Changes for use with Numerical Python: builtin function slice() and
+- Changes for use with Numerical Python: built-in function slice() and
Ellipses object, and corresponding syntax:
x[lo:hi:stride] == x[slice(lo, hi, stride)]
@@ -15163,7 +15163,7 @@
- The functions posix.popen() and posix.fdopen() now have an optional
third argument to specify the buffer size, and default their second
-(mode) argument to 'r' -- in analogy to the builtin open() function.
+(mode) argument to 'r' -- in analogy to the built-in open() function.
The same applies to posixfile.open() and the socket method makefile().
- The thread.exit_thread() function now raises SystemExit so that
diff --git a/Misc/NEWS b/Misc/NEWS
index d390a2d..10dd9e2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,9 @@
Library
-------
+- Issue #6544: fix a reference leak in the kqueue implementation's error
+ handling.
+
- Issue #7774: Set sys.executable to an empty string if argv[0] has been
set to an non existent program name and Python is unable to retrieve the real
program name
@@ -505,8 +508,8 @@
- Issue #4618: When unicode arguments are passed to print(), the default
separator and end should be unicode also.
-- Issue #6119: Fixed a incorrect Py3k warning about order comparisons of
- builtin functions and methods.
+- Issue #6119: Fixed an incorrect Py3k warning about order comparisons of
+ built-in functions and methods.
- Issue #5330: C functions called with keyword arguments were not reported by
the various profiling modules (profile, cProfile). Patch by Hagen Fürstenau.
@@ -535,7 +538,7 @@
- Issue #5829: complex('1e-500') no longer raises an exception
- Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on
- some builtin types.
+ some built-in types.
- Issue #5283: Setting __class__ in __del__ caused a segfault.
@@ -2799,7 +2802,7 @@
- Fixed a minor memory leak in dictobject.c. The content of the free
list was not freed on interpreter shutdown.
-- Limit free list of method and builtin function objects to 256
+- Limit free list of method and built-in function objects to 256
entries each.
- Patch #1953: Added ``sys._compact_freelists()`` and the C API
@@ -2933,7 +2936,7 @@
- Fix warnings found by the new version of the Coverity checker.
-- The enumerate() builtin function is no longer bounded to sequences
+- The enumerate() built-in function is no longer bounded to sequences
smaller than LONG_MAX. Formerly, it raised an OverflowError. Now,
automatically shifts from ints to longs.
@@ -2994,7 +2997,7 @@
- Deprecate BaseException.message as per PEP 352.
- Issue #1303614: don't expose object's __dict__ when the dict is
- inherited from a builtin base.
+ inherited from a built-in base.
- When __slots__ are set to a unicode string, make it work the same as
setting a plain string, ie don't expand to single letter identifiers.
@@ -3903,7 +3906,7 @@
GNU modes.
- Bug #1586448: the compiler module now emits the same bytecode for
- list comprehensions as the builtin compiler, using the LIST_APPEND
+ list comprehensions as the built-in compiler, using the LIST_APPEND
opcode.
- Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and
@@ -4135,7 +4138,7 @@
- Bug #1653736: Complain about keyword arguments to time.isoformat.
- Bug #1486663: don't reject keyword arguments for subclasses of
- builtin types.
+ built-in types.
- Patch #1610575: The struct module now supports the 't' code, for C99
_Bool.
@@ -4318,7 +4321,7 @@
- Bug #1629566: clarify the docs on the return values of parsedate()
and parsedate_tz() in email.utils and rfc822.
-- Patch #1671450: add a section about subclassing builtin types to the
+- Patch #1671450: add a section about subclassing built-in types to the
"extending and embedding" tutorial.
- Bug #1629125: fix wrong data type (int -> Py_ssize_t) in PyDict_Next
diff --git a/Misc/SpecialBuilds.txt b/Misc/SpecialBuilds.txt
index fa87d92..25bb6d1 100644
--- a/Misc/SpecialBuilds.txt
+++ b/Misc/SpecialBuilds.txt
@@ -37,7 +37,7 @@
Turn on heavy reference debugging. This is major surgery. Every PyObject
grows two more pointers, to maintain a doubly-linked list of all live
-heap-allocated objects. Most builtin type objects are not in this list,
+heap-allocated objects. Most built-in type objects are not in this list,
as they're statically allocated. Starting in Python 2.3, if COUNT_ALLOCS
(see below) is also defined, a static type object T does appear in this
list if at least one object of type T has been created.