traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 60176-60209 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r60178 | georg.brandl | 2008-01-21 22:05:49 +0100 (Mon, 21 Jan 2008) | 2 lines

  #1715: include sub-extension modules in pydoc text output.
........
  r60179 | georg.brandl | 2008-01-21 22:14:21 +0100 (Mon, 21 Jan 2008) | 2 lines

  Add a "const" to make gcc happy.
........
  r60180 | georg.brandl | 2008-01-21 22:19:07 +0100 (Mon, 21 Jan 2008) | 2 lines

  Add the correct build dir when building with pydebug.
........
  r60181 | georg.brandl | 2008-01-21 22:23:15 +0100 (Mon, 21 Jan 2008) | 3 lines

  Patch #1720595: add T_BOOL to the range of structmember types.
  Patch by Angelo Mottola, reviewed by MvL, tests by me.
........
  r60182 | georg.brandl | 2008-01-21 22:28:32 +0100 (Mon, 21 Jan 2008) | 2 lines

  Reformat some ugly code.
........
  r60187 | brett.cannon | 2008-01-22 00:50:16 +0100 (Tue, 22 Jan 2008) | 4 lines

  Make's MAKEFLAGS variable is set to a string containing the single-letter
  arguments to Make. This means there are no hyphens. Fix the '-s' check to
  silence distutils to now work.
........
  r60188 | gregory.p.smith | 2008-01-22 01:19:41 +0100 (Tue, 22 Jan 2008) | 3 lines

  accepts and closes issue #1221598: adds an optional callback to ftplib.FTP
  storbinary() and storlines() methods.
........
  r60189 | gregory.p.smith | 2008-01-22 02:12:02 +0100 (Tue, 22 Jan 2008) | 2 lines

  Replace spam.acquire() try: ... finally: spam.release() with "with spam:"
........
  r60190 | gregory.p.smith | 2008-01-22 02:20:42 +0100 (Tue, 22 Jan 2008) | 4 lines

  - Fix Issue #1703448: A joined thread could show up in the
    threading.enumerate() list after the join() for a brief period until
    it actually exited.
........
  r60193 | georg.brandl | 2008-01-22 08:53:31 +0100 (Tue, 22 Jan 2008) | 2 lines

  Fix \xhh specs, #1889.
........
  r60198 | christian.heimes | 2008-01-22 16:01:25 +0100 (Tue, 22 Jan 2008) | 1 line

  Fixed a missing (X) in define
........
  r60199 | christian.heimes | 2008-01-22 16:25:18 +0100 (Tue, 22 Jan 2008) | 2 lines

  Don't repeat yourself
  Added the macros PyModule_AddIntMacro and PyModule_AddStringMacro. They shorten PyModule_AddIntConstant(m, "AF_INET", AF_INET) to PyModule_AddIntMacro(m, AF_INET)
........
  r60201 | raymond.hettinger | 2008-01-22 20:51:41 +0100 (Tue, 22 Jan 2008) | 1 line

  Document when to use izip_longest().
........
  r60202 | georg.brandl | 2008-01-22 20:56:03 +0100 (Tue, 22 Jan 2008) | 2 lines

  Fix for #1087741 patch.
........
  r60203 | raymond.hettinger | 2008-01-22 21:18:53 +0100 (Tue, 22 Jan 2008) | 1 line

  Give zip() the same guarantee as izip() for left-to-right evaluation.
........
  r60204 | raymond.hettinger | 2008-01-22 23:09:26 +0100 (Tue, 22 Jan 2008) | 1 line

  Improve variable name in sample code
........
  r60205 | gregory.p.smith | 2008-01-23 00:15:34 +0100 (Wed, 23 Jan 2008) | 2 lines

  docstring and comment updates suggested by Giampaolo Rodola'
........
  r60207 | raymond.hettinger | 2008-01-23 01:04:40 +0100 (Wed, 23 Jan 2008) | 1 line

  Let pprint() support sets and frozensets (suggested by David Mertz).
........
  r60208 | guido.van.rossum | 2008-01-23 02:18:27 +0100 (Wed, 23 Jan 2008) | 4 lines

  I'm tired of these tests breaking at Google due to our large number of
  users and groups in LDAP/NIS.  So I'm limiting the extra-heavy part of
  the tests to passwd/group files with at most 1000 entries.
........
This commit is contained in:
Christian Heimes 2008-01-23 08:24:23 +00:00
parent 1dfde1ddc0
commit 1af737cd1e
24 changed files with 268 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Doc/c-api/module.rst
View File

@ -18,12 +18,12 @@ There are only a few functions special to module objects.
is exposed to Python programs as ``types.ModuleType``. is exposed to Python programs as ``types.ModuleType``.
.. cfunction:: int PyModule_Check(PyObject *p) .. cmacro:: int PyModule_Check(PyObject *p)
Return true if *p* is a module object, or a subtype of a module object. Return true if *p* is a module object, or a subtype of a module object.
.. cfunction:: int PyModule_CheckExact(PyObject *p) .. cmacro:: int PyModule_CheckExact(PyObject *p)
Return true if *p* is a module object, but not a subtype of Return true if *p* is a module object, but not a subtype of
:cdata:`PyModule_Type`. :cdata:`PyModule_Type`.
@ -92,3 +92,17 @@ There are only a few functions special to module objects.
Add a string constant to *module* as *name*. This convenience function can be Add a string constant to *module* as *name*. This convenience function can be
used from the module's initialization function. The string *value* must be used from the module's initialization function. The string *value* must be
null-terminated. Return ``-1`` on error, ``0`` on success. null-terminated. Return ``-1`` on error, ``0`` on success.
.. cmacro:: int PyModule_AddIntMacro(PyObject *module, macro)
Add an int constant to *module*. The name and the value are taken from
*macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int
constant *AF_INET* with the value of *AF_INET* to *module*.
Return ``-1`` on error, ``0`` on success.
.. cmacro:: int PyModule_AddStringMacro(PyObject *module, macro)
Add a string constant to *module*.

4
Doc/library/functions.rst
View File

@ -1140,6 +1140,10 @@ available. They are listed here in alphabetical order.
sequence argument, it returns an iterator of 1-tuples. With no arguments, it sequence argument, it returns an iterator of 1-tuples. With no arguments, it
returns an empty iterator. returns an empty iterator.
The left-to-right evaluation order of the iterables is guaranteed. This
makes possible an idiom for clustering a data series into n-length groups
using ``zip(*[iter(s)]*n)``.
.. rubric:: Footnotes .. rubric:: Footnotes

19
Doc/library/itertools.rst
View File

@ -210,7 +210,10 @@ loops that truncate the stream.
iterables = [iter(it) for it in iterables) iterables = [iter(it) for it in iterables)
while True: while True:
args = [next(it) for it in iterables] args = [next(it) for it in iterables]
yield function(*args) if function is None:
yield tuple(args)
else:
yield function(*args)
.. function:: islice(iterable, [start,] stop [, step]) .. function:: islice(iterable, [start,] stop [, step])
@ -252,12 +255,11 @@ loops that truncate the stream.
When no iterables are specified, return a zero length iterator. When no iterables are specified, return a zero length iterator.
Note, the left-to-right evaluation order of the iterables is guaranteed. This The left-to-right evaluation order of the iterables is guaranteed. This
makes possible an idiom for clustering a data series into n-length groups using makes possible an idiom for clustering a data series into n-length groups
``izip(*[iter(s)]*n)``. For data that doesn't fit n-length groups exactly, the using ``izip(*[iter(s)]*n)``.
last tuple can be pre-padded with fill values using ``izip(*[chain(s,
[None]*(n-1))]*n)``.
<<<<<<< .working
Note, when :func:`izip` is used with unequal length inputs, subsequent Note, when :func:`izip` is used with unequal length inputs, subsequent
iteration over the longer iterables cannot reliably be continued after iteration over the longer iterables cannot reliably be continued after
:func:`izip` terminates. Potentially, up to one entry will be missing from :func:`izip` terminates. Potentially, up to one entry will be missing from
@ -268,6 +270,11 @@ loops that truncate the stream.
the iterator for retrieval with ``next(it)``). In general, :func:`izip` the iterator for retrieval with ``next(it)``). In general, :func:`izip`
should only be used with unequal length inputs when you don't care about should only be used with unequal length inputs when you don't care about
trailing, unmatched values from the longer iterables. trailing, unmatched values from the longer iterables.
=======
:func:`izip` should only be used with unequal length inputs when you don't
care about trailing, unmatched values from the longer iterables. If those
values are important, use :func:`izip_longest` instead.
>>>>>>> .merge-right.r60208
.. function:: izip_longest(*iterables[, fillvalue]) .. function:: izip_longest(*iterables[, fillvalue])

3
Doc/library/pprint.rst
View File

@ -22,6 +22,9 @@ width constraint.
Dictionaries are sorted by key before the display is computed. Dictionaries are sorted by key before the display is computed.
.. versionchanged:: 2.6
Added support for :class:`set` and :class:`frozenset`.
The :mod:`pprint` module defines one class: The :mod:`pprint` module defines one class:
.. First the implementation class: .. First the implementation class:

2
Doc/reference/lexical_analysis.rst
View File

@ -502,7 +502,7 @@ Notes:
(4) (4)
Individual code units which form parts of a surrogate pair can be encoded using Individual code units which form parts of a surrogate pair can be encoded using
this escape sequence. this escape sequence. Unlike in Standard C, exactly two hex digits are required.
(5) (5)
Any Unicode character can be encoded this way, but characters outside the Basic Any Unicode character can be encoded this way, but characters outside the Basic

3
Include/modsupport.h
View File

@ -40,7 +40,8 @@ PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list);
PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *); PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *);
PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long); PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *); PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
#define PYTHON_API_VERSION 1013 #define PYTHON_API_VERSION 1013
#define PYTHON_API_STRING "1013" #define PYTHON_API_STRING "1013"

2
Include/pyport.h
View File

@ -389,7 +389,7 @@ extern "C" {
*/ */
#ifndef Py_IS_FINITE #ifndef Py_IS_FINITE
#ifdef HAVE_FINITE #ifdef HAVE_FINITE
#define Py_IS_FINITE(X) finite #define Py_IS_FINITE(X) finite(X)
#else #else
#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) #define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X))
#endif #endif

3
Include/structmember.h
View File

@ -54,6 +54,9 @@ typedef struct PyMemberDef {
/* Added by Jack: strings contained in the structure */ /* Added by Jack: strings contained in the structure */
#define T_STRING_INPLACE 13 #define T_STRING_INPLACE 13
/* Added by Lillo: bools contained in the structure (assumed char) */
#define T_BOOL 14
#define T_OBJECT_EX 16 /* Like T_OBJECT, but raises AttributeError #define T_OBJECT_EX 16 /* Like T_OBJECT, but raises AttributeError
when the value is NULL, instead of when the value is NULL, instead of
converting to None. */ converting to None. */

69
Lib/ftplib.py
View File

@ -32,6 +32,7 @@ python ftplib.py -d localhost -l -p -l
# Changes and improvements suggested by Steve Majewski. # Changes and improvements suggested by Steve Majewski.
# Modified by Jack to work on the mac. # Modified by Jack to work on the mac.
# Modified by Siebren to support docstrings and PASV. # Modified by Siebren to support docstrings and PASV.
# Modified by Phil Schwartz to add storbinary and storlines callbacks.
# #
import os import os
@ -313,7 +314,7 @@ class FTP:
expected size may be None if it could not be determined. expected size may be None if it could not be determined.
Optional `rest' argument can be a string that is sent as the Optional `rest' argument can be a string that is sent as the
argument to a RESTART command. This is essentially a server argument to a REST command. This is essentially a server
marker used to tell the server to skip over any data up to the marker used to tell the server to skip over any data up to the
given marker. given marker.
""" """
@ -376,14 +377,18 @@ class FTP:
return resp return resp
def retrbinary(self, cmd, callback, blocksize=8192, rest=None): def retrbinary(self, cmd, callback, blocksize=8192, rest=None):
"""Retrieve data in binary mode. """Retrieve data in binary mode. A new port is created for you.
`cmd' is a RETR command. `callback' is a callback function is Args:
called for each block. No more than `blocksize' number of cmd: A RETR command.
bytes will be read from the socket. Optional `rest' is passed callback: A single parameter callable to be called on each
to transfercmd(). block of data read.
blocksize: The maximum number of bytes to read from the
socket at one time. [default: 8192]
rest: Passed to transfercmd(). [default: None]
A new port is created for you. Return the response code. Returns:
The response code.
""" """
self.voidcmd('TYPE I') self.voidcmd('TYPE I')
conn = self.transfercmd(cmd, rest) conn = self.transfercmd(cmd, rest)
@ -396,11 +401,17 @@ class FTP:
return self.voidresp() return self.voidresp()
def retrlines(self, cmd, callback = None): def retrlines(self, cmd, callback = None):
'''Retrieve data in line mode. """Retrieve data in line mode. A new port is created for you.
The argument is a RETR or LIST command.
The callback function (2nd argument) is called for each line, Args:
with trailing CRLF stripped. This creates a new port for you. cmd: A RETR, LIST, NLST, or MLSD command.
print_line() is the default callback.''' callback: An optional single parameter callable that is called
for each line with the trailing CRLF stripped.
[default: print_line()]
Returns:
The response code.
"""
if callback is None: callback = print_line if callback is None: callback = print_line
resp = self.sendcmd('TYPE A') resp = self.sendcmd('TYPE A')
conn = self.transfercmd(cmd) conn = self.transfercmd(cmd)
@ -419,19 +430,42 @@ class FTP:
conn.close() conn.close()
return self.voidresp() return self.voidresp()
def storbinary(self, cmd, fp, blocksize=8192): def storbinary(self, cmd, fp, blocksize=8192, callback=None):
'''Store a file in binary mode.''' """Store a file in binary mode. A new port is created for you.
Args:
cmd: A STOR command.
fp: A file-like object with a read(num_bytes) method.
blocksize: The maximum data size to read from fp and send over
the connection at once. [default: 8192]
callback: An optional single parameter callable that is called on
on each block of data after it is sent. [default: None]
Returns:
The response code.
"""
self.voidcmd('TYPE I') self.voidcmd('TYPE I')
conn = self.transfercmd(cmd) conn = self.transfercmd(cmd)
while 1: while 1:
buf = fp.read(blocksize) buf = fp.read(blocksize)
if not buf: break if not buf: break
conn.sendall(buf) conn.sendall(buf)
if callback: callback(buf)
conn.close() conn.close()
return self.voidresp() return self.voidresp()
def storlines(self, cmd, fp): def storlines(self, cmd, fp, callback=None):
'''Store a file in line mode.''' """Store a file in line mode. A new port is created for you.
Args:
cmd: A STOR command.
fp: A file-like object with a readline() method.
callback: An optional single parameter callable that is called on
on each line after it is sent. [default: None]
Returns:
The response code.
"""
self.voidcmd('TYPE A') self.voidcmd('TYPE A')
conn = self.transfercmd(cmd) conn = self.transfercmd(cmd)
while 1: while 1:
@ -441,6 +475,7 @@ class FTP:
if buf[-1] in CRLF: buf = buf[:-1] if buf[-1] in CRLF: buf = buf[:-1]
buf = buf + CRLF buf = buf + CRLF
conn.sendall(buf) conn.sendall(buf)
if callback: callback(buf)
conn.close() conn.close()
return self.voidresp() return self.voidresp()
@ -505,7 +540,7 @@ class FTP:
def size(self, filename): def size(self, filename):
'''Retrieve the size of a file.''' '''Retrieve the size of a file.'''
# Note that the RFC doesn't say anything about 'SIZE' # The SIZE command is defined in RFC-3659
resp = self.sendcmd('SIZE ' + filename) resp = self.sendcmd('SIZE ' + filename)
if resp[:3] == '213': if resp[:3] == '213':
s = resp[3:].strip() s = resp[3:].strip()

17
Lib/pprint.py
View File

@ -159,11 +159,24 @@ class PrettyPrinter:
write('}') write('}')
return return
if (issubclass(typ, list) and r is list.__repr__) or \ if ((issubclass(typ, list) and r is list.__repr__) or
(issubclass(typ, tuple) and r is tuple.__repr__): (issubclass(typ, tuple) and r is tuple.__repr__) or
(issubclass(typ, set) and r is set.__repr__) or
(issubclass(typ, frozenset) and r is frozenset.__repr__)
):
if issubclass(typ, list): if issubclass(typ, list):
write('[') write('[')
endchar = ']' endchar = ']'
elif issubclass(typ, set):
write('{')
endchar = '}'
object = sorted(object)
indent += 4
elif issubclass(typ, frozenset):
write('frozenset([')
endchar = '])'
object = sorted(object)
indent += 9
else: else:
write('(') write('(')
endchar = ')' endchar = ')'

14
Lib/pydoc.py
View File

@ -1055,9 +1055,11 @@ class TextDoc(Doc):
if visiblename(key, all): if visiblename(key, all):
data.append((key, value)) data.append((key, value))
modpkgs = []
modpkgs_names = set()
if hasattr(object, '__path__'): if hasattr(object, '__path__'):
modpkgs = []
for importer, modname, ispkg in pkgutil.iter_modules(object.__path__): for importer, modname, ispkg in pkgutil.iter_modules(object.__path__):
modpkgs_names.add(modname)
if ispkg: if ispkg:
modpkgs.append(modname + ' (package)') modpkgs.append(modname + ' (package)')
else: else:
@ -1067,6 +1069,16 @@ class TextDoc(Doc):
result = result + self.section( result = result + self.section(
'PACKAGE CONTENTS', '\n'.join(modpkgs)) 'PACKAGE CONTENTS', '\n'.join(modpkgs))
# Detect submodules as sometimes created by C extensions
submodules = []
for key, value in inspect.getmembers(object, inspect.ismodule):
if value.__name__.startswith(name + '.') and key not in modpkgs_names:
submodules.append(key)
if submodules:
submodules.sort()
result = result + self.section(
'SUBMODULES', join(submodules, '\n'))
if classes: if classes:
classlist = [value for key, value in classes] classlist = [value for key, value in classes]
contents = [self.formattree( contents = [self.formattree(

2
Lib/site.py
View File

@ -96,6 +96,8 @@ def addbuilddir():
(especially for Guido :-)""" (especially for Guido :-)"""
from distutils.util import get_platform from distutils.util import get_platform
s = "build/lib.%s-%.3s" % (get_platform(), sys.version) s = "build/lib.%s-%.3s" % (get_platform(), sys.version)
if hasattr(sys, 'gettotalrefcount'):
s += '-pydebug'
s = os.path.join(os.path.dirname(sys.path[-1]), s) s = os.path.join(os.path.dirname(sys.path[-1]), s)
sys.path.append(s) sys.path.append(s)

6
Lib/test/pydocfodder.py
View File

@ -1,5 +1,7 @@
"""Something just to look at via pydoc.""" """Something just to look at via pydoc."""
import types
class A_classic: class A_classic:
"A classic class." "A classic class."
def A_method(self): def A_method(self):
@ -208,3 +210,7 @@ class FunkyProperties(object):
del inst.desc[self.attr] del inst.desc[self.attr]
x = property(get_desc('x'), set_desc('x'), del_desc('x'), 'prop x') x = property(get_desc('x'), set_desc('x'), del_desc('x'), 'prop x')
submodule = types.ModuleType(__name__ + '.submodule',
"""A submodule, which should appear in its parent's summary""")

3
Lib/test/test_grp.py
View File

@ -25,6 +25,9 @@ class GroupDatabaseTestCase(unittest.TestCase):
for e in entries: for e in entries:
self.check_value(e) self.check_value(e)
if len(entries) > 1000: # Huge group file (NIS?) -- skip the rest
return
for e in entries: for e in entries:
e2 = grp.getgrgid(e.gr_gid) e2 = grp.getgrgid(e.gr_gid)
self.check_value(e2) self.check_value(e2)

7
Lib/test/test_mmap.py
View File

@ -419,6 +419,13 @@ class MmapTests(unittest.TestCase):
except OSError: except OSError:
pass pass
def test_subclass(self):
class anon_mmap(mmap.mmap):
def __new__(klass, *args, **kwargs):
return mmap.mmap.__new__(klass, -1, *args, **kwargs)
anon_mmap(PAGESIZE)
def test_main(): def test_main():
run_unittest(MmapTests) run_unittest(MmapTests)

3
Lib/test/test_pwd.py
View File

@ -35,6 +35,9 @@ class PwdTest(unittest.TestCase):
entriesbyname.setdefault(e.pw_name, []).append(e) entriesbyname.setdefault(e.pw_name, []).append(e)
entriesbyuid.setdefault(e.pw_uid, []).append(e) entriesbyuid.setdefault(e.pw_uid, []).append(e)
if len(entries) > 1000: # Huge passwd file (NIS?) -- skip the rest
return
# check whether the entry returned by getpwuid() # check whether the entry returned by getpwuid()
# for each uid is among those from getpwall() for this uid # for each uid is among those from getpwall() for this uid
for e in entries: for e in entries:

55
Lib/test/test_structmembers.py
View File

@ -8,52 +8,59 @@ from _testcapi import test_structmembersType, \
import warnings, unittest, sys import warnings, unittest, sys
from test import test_support from test import test_support
ts=test_structmembersType(1,2,3,4,5,6,7,8,9.99999,10.1010101010) ts=test_structmembersType(False, 1, 2, 3, 4, 5, 6, 7, 8,
9.99999, 10.1010101010)
class ReadWriteTests(unittest.TestCase): class ReadWriteTests(unittest.TestCase):
def test_types(self): def test_types(self):
ts.T_BYTE=CHAR_MAX ts.T_BOOL = True
self.assertEquals(ts.T_BOOL, True)
ts.T_BOOL = False
self.assertEquals(ts.T_BOOL, False)
self.assertRaises(TypeError, setattr, ts, 'T_BOOL', 1)
ts.T_BYTE = CHAR_MAX
self.assertEquals(ts.T_BYTE, CHAR_MAX) self.assertEquals(ts.T_BYTE, CHAR_MAX)
ts.T_BYTE=CHAR_MIN ts.T_BYTE = CHAR_MIN
self.assertEquals(ts.T_BYTE, CHAR_MIN) self.assertEquals(ts.T_BYTE, CHAR_MIN)
ts.T_UBYTE=UCHAR_MAX ts.T_UBYTE = UCHAR_MAX
self.assertEquals(ts.T_UBYTE, UCHAR_MAX) self.assertEquals(ts.T_UBYTE, UCHAR_MAX)
ts.T_SHORT=SHRT_MAX ts.T_SHORT = SHRT_MAX
self.assertEquals(ts.T_SHORT, SHRT_MAX) self.assertEquals(ts.T_SHORT, SHRT_MAX)
ts.T_SHORT=SHRT_MIN ts.T_SHORT = SHRT_MIN
self.assertEquals(ts.T_SHORT, SHRT_MIN) self.assertEquals(ts.T_SHORT, SHRT_MIN)
ts.T_USHORT=USHRT_MAX ts.T_USHORT = USHRT_MAX
self.assertEquals(ts.T_USHORT, USHRT_MAX) self.assertEquals(ts.T_USHORT, USHRT_MAX)
ts.T_INT=INT_MAX ts.T_INT = INT_MAX
self.assertEquals(ts.T_INT, INT_MAX) self.assertEquals(ts.T_INT, INT_MAX)
ts.T_INT=INT_MIN ts.T_INT = INT_MIN
self.assertEquals(ts.T_INT, INT_MIN) self.assertEquals(ts.T_INT, INT_MIN)
ts.T_UINT=UINT_MAX ts.T_UINT = UINT_MAX
self.assertEquals(ts.T_UINT, UINT_MAX) self.assertEquals(ts.T_UINT, UINT_MAX)
ts.T_LONG=LONG_MAX ts.T_LONG = LONG_MAX
self.assertEquals(ts.T_LONG, LONG_MAX) self.assertEquals(ts.T_LONG, LONG_MAX)
ts.T_LONG=LONG_MIN ts.T_LONG = LONG_MIN
self.assertEquals(ts.T_LONG, LONG_MIN) self.assertEquals(ts.T_LONG, LONG_MIN)
ts.T_ULONG=ULONG_MAX ts.T_ULONG = ULONG_MAX
self.assertEquals(ts.T_ULONG, ULONG_MAX) self.assertEquals(ts.T_ULONG, ULONG_MAX)
## T_LONGLONG and T_ULONGLONG may not be present on some platforms ## T_LONGLONG and T_ULONGLONG may not be present on some platforms
if hasattr(ts, 'T_LONGLONG'): if hasattr(ts, 'T_LONGLONG'):
ts.T_LONGLONG=LLONG_MAX ts.T_LONGLONG = LLONG_MAX
self.assertEquals(ts.T_LONGLONG, LLONG_MAX) self.assertEquals(ts.T_LONGLONG, LLONG_MAX)
ts.T_LONGLONG=LLONG_MIN ts.T_LONGLONG = LLONG_MIN
self.assertEquals(ts.T_LONGLONG, LLONG_MIN) self.assertEquals(ts.T_LONGLONG, LLONG_MIN)
ts.T_ULONGLONG=ULLONG_MAX ts.T_ULONGLONG = ULLONG_MAX
self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX) self.assertEquals(ts.T_ULONGLONG, ULLONG_MAX)
## make sure these will accept a plain int as well as a long ## make sure these will accept a plain int as well as a long
ts.T_LONGLONG=3 ts.T_LONGLONG = 3
self.assertEquals(ts.T_LONGLONG, 3) self.assertEquals(ts.T_LONGLONG, 3)
ts.T_ULONGLONG=4 ts.T_ULONGLONG = 4
self.assertEquals(ts.T_ULONGLONG, 4) self.assertEquals(ts.T_ULONGLONG, 4)
@ -63,32 +70,32 @@ class TestWarnings(unittest.TestCase):
def test_byte_max(self): def test_byte_max(self):
with test_support.catch_warning() as w: with test_support.catch_warning() as w:
ts.T_BYTE=CHAR_MAX+1 ts.T_BYTE = CHAR_MAX+1
self.has_warned(w) self.has_warned(w)
def test_byte_min(self): def test_byte_min(self):
with test_support.catch_warning() as w: with test_support.catch_warning() as w:
ts.T_BYTE=CHAR_MIN-1 ts.T_BYTE = CHAR_MIN-1
self.has_warned(w) self.has_warned(w)
def test_ubyte_max(self): def test_ubyte_max(self):
with test_support.catch_warning() as w: with test_support.catch_warning() as w:
ts.T_UBYTE=UCHAR_MAX+1 ts.T_UBYTE = UCHAR_MAX+1
self.has_warned(w) self.has_warned(w)
def test_short_max(self): def test_short_max(self):
with test_support.catch_warning() as w: with test_support.catch_warning() as w:
ts.T_SHORT=SHRT_MAX+1 ts.T_SHORT = SHRT_MAX+1
self.has_warned(w) self.has_warned(w)
def test_short_min(self): def test_short_min(self):
with test_support.catch_warning() as w: with test_support.catch_warning() as w:
ts.T_SHORT=SHRT_MIN-1 ts.T_SHORT = SHRT_MIN-1
self.has_warned(w) self.has_warned(w)
def test_ushort_max(self): def test_ushort_max(self):
with test_support.catch_warning() as w: with test_support.catch_warning() as w:
ts.T_USHORT=USHRT_MAX+1 ts.T_USHORT = USHRT_MAX+1
self.has_warned(w) self.has_warned(w)

18
Lib/test/test_threading.py
View File

@ -236,6 +236,24 @@ class ThreadTests(unittest.TestCase):
"""]) """])
self.assertEqual(rc, 42) self.assertEqual(rc, 42)
def test_enumerate_after_join(self):
# Try hard to trigger #1703448: a thread is still returned in
# threading.enumerate() after it has been join()ed.
enum = threading.enumerate
old_interval = sys.getcheckinterval()
sys.setcheckinterval(1)
try:
for i in range(1, 1000):
t = threading.Thread(target=lambda: None)
t.start()
t.join()
l = enum()
self.assertFalse(t in l,
"#1703448 triggered after %d trials: %s" % (i, l))
finally:
sys.setcheckinterval(old_interval)
class ThreadingExceptionTests(unittest.TestCase): class ThreadingExceptionTests(unittest.TestCase):
# A RuntimeError should be raised if Thread.start() is called # A RuntimeError should be raised if Thread.start() is called
# multiple times. # multiple times.

45
Lib/threading.py
View File

@ -346,27 +346,18 @@ class _Event(_Verbose):
return self._flag return self._flag
def set(self): def set(self):
self._cond.acquire() with self._cond:
try:
self._flag = True self._flag = True
self._cond.notifyAll() self._cond.notifyAll()
finally:
self._cond.release()
def clear(self): def clear(self):
self._cond.acquire() with self._cond:
try:
self._flag = False self._flag = False
finally:
self._cond.release()
def wait(self, timeout=None): def wait(self, timeout=None):
self._cond.acquire() with self._cond:
try:
if not self._flag: if not self._flag:
self._cond.wait(timeout) self._cond.wait(timeout)
finally:
self._cond.release()
# Helper to generate new thread names # Helper to generate new thread names
_counter = 0 _counter = 0
@ -523,17 +514,19 @@ class Thread(_Verbose):
if __debug__: if __debug__:
self._note("%s.__bootstrap(): normal return", self) self._note("%s.__bootstrap(): normal return", self)
finally: finally:
self._stop() with _active_limbo_lock:
try: self._stop()
self._delete() try:
except: # We don't call self.__delete() because it also
pass # grabs _active_limbo_lock.
del _active[_get_ident()]
except:
pass
def _stop(self): def _stop(self):
self._block.acquire() with self._block:
self._stopped = True self._stopped = True
self._block.notifyAll() self._block.notifyAll()
self._block.release()
def _delete(self): def _delete(self):
"Remove current thread from the dict of currently running threads." "Remove current thread from the dict of currently running threads."
@ -559,15 +552,12 @@ class Thread(_Verbose):
# since it isn't if dummy_threading is *not* being used then don't # since it isn't if dummy_threading is *not* being used then don't
# hide the exception. # hide the exception.
_active_limbo_lock.acquire() with _active_limbo_lock:
try:
try: try:
del _active[_get_ident()] del _active[_get_ident()]
except KeyError: except KeyError:
if 'dummy_threading' not in _sys.modules: if 'dummy_threading' not in _sys.modules:
raise raise
finally:
_active_limbo_lock.release()
def join(self, timeout=None): def join(self, timeout=None):
if not self._initialized: if not self._initialized:
@ -580,8 +570,7 @@ class Thread(_Verbose):
if __debug__: if __debug__:
if not self._stopped: if not self._stopped:
self._note("%s.join(): waiting until thread stops", self) self._note("%s.join(): waiting until thread stops", self)
self._block.acquire() with self._block:
try:
if timeout is None: if timeout is None:
while not self._stopped: while not self._stopped:
self._block.wait() self._block.wait()
@ -599,8 +588,6 @@ class Thread(_Verbose):
else: else:
if __debug__: if __debug__:
self._note("%s.join(): thread stopped", self) self._note("%s.join(): thread stopped", self)
finally:
self._block.release()
def getName(self): def getName(self):
assert self._initialized, "Thread.__init__() not called" assert self._initialized, "Thread.__init__() not called"

2
Makefile.pre.in
View File

@ -360,7 +360,7 @@ platform: $(BUILDPYTHON)
# Build the shared modules # Build the shared modules
sharedmods: $(BUILDPYTHON) sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \ @case $$MAKEFLAGS in \
*-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
esac esac

66
Modules/_testcapimodule.c
View File

@ -930,6 +930,7 @@ static PyMethodDef TestMethods[] = {
#define AddSym(d, n, f, v) {PyObject *o = f(v); PyDict_SetItemString(d, n, o); Py_DECREF(o);} #define AddSym(d, n, f, v) {PyObject *o = f(v); PyDict_SetItemString(d, n, o); Py_DECREF(o);}
typedef struct { typedef struct {
char bool_member;
char byte_member; char byte_member;
unsigned char ubyte_member; unsigned char ubyte_member;
short short_member; short short_member;
@ -952,6 +953,7 @@ typedef struct {
} test_structmembers; } test_structmembers;
static struct PyMemberDef test_members[] = { static struct PyMemberDef test_members[] = {
{"T_BOOL", T_BOOL, offsetof(test_structmembers, structmembers.bool_member), 0, NULL},
{"T_BYTE", T_BYTE, offsetof(test_structmembers, structmembers.byte_member), 0, NULL}, {"T_BYTE", T_BYTE, offsetof(test_structmembers, structmembers.byte_member), 0, NULL},
{"T_UBYTE", T_UBYTE, offsetof(test_structmembers, structmembers.ubyte_member), 0, NULL}, {"T_UBYTE", T_UBYTE, offsetof(test_structmembers, structmembers.ubyte_member), 0, NULL},
{"T_SHORT", T_SHORT, offsetof(test_structmembers, structmembers.short_member), 0, NULL}, {"T_SHORT", T_SHORT, offsetof(test_structmembers, structmembers.short_member), 0, NULL},
@ -970,39 +972,53 @@ static struct PyMemberDef test_members[] = {
}; };
static PyObject *test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs){ static PyObject *
static char *keywords[]={"T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT", "T_INT", "T_UINT", test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
"T_LONG", "T_ULONG", "T_FLOAT", "T_DOUBLE", {
#ifdef HAVE_LONG_LONG static char *keywords[] = {
"T_BOOL", "T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT",
"T_INT", "T_UINT", "T_LONG", "T_ULONG",
"T_FLOAT", "T_DOUBLE",
#ifdef HAVE_LONG_LONG
"T_LONGLONG", "T_ULONGLONG", "T_LONGLONG", "T_ULONGLONG",
#endif #endif
NULL}; NULL};
static char *fmt="|bBhHiIlkfd" static char *fmt = "|bbBhHiIlkfd"
#ifdef HAVE_LONG_LONG #ifdef HAVE_LONG_LONG
"LK" "LK"
#endif #endif
; ;
test_structmembers *ob=PyObject_New(test_structmembers, type); test_structmembers *ob;
if (ob==NULL) ob = PyObject_New(test_structmembers, type);
if (ob == NULL)
return NULL; return NULL;
memset(&ob->structmembers, 0, sizeof(all_structmembers)); memset(&ob->structmembers, 0, sizeof(all_structmembers));
if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, keywords, if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, keywords,
&ob->structmembers.byte_member, &ob->structmembers.ubyte_member, &ob->structmembers.bool_member,
&ob->structmembers.short_member, &ob->structmembers.ushort_member, &ob->structmembers.byte_member,
&ob->structmembers.int_member, &ob->structmembers.uint_member, &ob->structmembers.ubyte_member,
&ob->structmembers.long_member, &ob->structmembers.ulong_member, &ob->structmembers.short_member,
&ob->structmembers.float_member, &ob->structmembers.double_member &ob->structmembers.ushort_member,
#ifdef HAVE_LONG_LONG &ob->structmembers.int_member,
,&ob->structmembers.longlong_member, &ob->structmembers.ulonglong_member &ob->structmembers.uint_member,
#endif &ob->structmembers.long_member,
)){ &ob->structmembers.ulong_member,
&ob->structmembers.float_member,
&ob->structmembers.double_member
#ifdef HAVE_LONG_LONG
, &ob->structmembers.longlong_member,
&ob->structmembers.ulonglong_member
#endif
)) {
Py_DECREF(ob); Py_DECREF(ob);
return NULL; return NULL;
} }
return (PyObject *)ob; return (PyObject *)ob;
} }
static void test_structmembers_free(PyObject *ob){ static void
test_structmembers_free(PyObject *ob)
{
PyObject_FREE(ob); PyObject_FREE(ob);
} }
@ -1023,8 +1039,8 @@ static PyTypeObject test_structmembersType = {
0, /* tp_hash */ 0, /* tp_hash */
0, /* tp_call */ 0, /* tp_call */
0, /* tp_str */ 0, /* tp_str */
PyObject_GenericGetAttr, PyObject_GenericGetAttr, /* tp_getattro */
PyObject_GenericSetAttr, PyObject_GenericSetAttr, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
0, /* tp_flags */ 0, /* tp_flags */
"Type containing all structmember types", "Type containing all structmember types",
@ -1035,7 +1051,7 @@ static PyTypeObject test_structmembersType = {
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
0, /* tp_methods */ 0, /* tp_methods */
test_members, /* tp_members */ test_members, /* tp_members */
0, 0,
0, 0,
0, 0,
@ -1044,7 +1060,7 @@ static PyTypeObject test_structmembersType = {
0, 0,
0, 0,
0, 0,
test_structmembers_new, /* tp_new */ test_structmembers_new, /* tp_new */
}; };

2
Modules/mmapmodule.c
View File

@ -130,7 +130,7 @@ mmap_object_dealloc(mmap_object *m_obj)
} }
#endif /* UNIX */ #endif /* UNIX */
PyObject_Del(m_obj); Py_TYPE(m_obj)->tp_free((PyObject*)m_obj);
} }
static PyObject * static PyObject *

2
Parser/tokenizer.c
View File

@ -640,7 +640,7 @@ decode_str(const char *str, struct tok_state *tok)
{ {
PyObject* utf8 = NULL; PyObject* utf8 = NULL;
const char *s; const char *s;
char *newl[2] = {NULL, NULL}; const char *newl[2] = {NULL, NULL};
int lineno = 0; int lineno = 0;
tok->enc = NULL; tok->enc = NULL;
tok->str = str; tok->str = str;

15
Python/structmember.c
View File

@ -12,6 +12,9 @@ PyMember_GetOne(const char *addr, PyMemberDef *l)
addr += l->offset; addr += l->offset;
switch (l->type) { switch (l->type) {
case T_BOOL:
v = PyBool_FromLong(*(char*)addr);
break;
case T_BYTE: case T_BYTE:
v = PyLong_FromLong(*(char*)addr); v = PyLong_FromLong(*(char*)addr);
break; break;
@ -113,6 +116,18 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
} }
addr += l->offset; addr += l->offset;
switch (l->type) { switch (l->type) {
case T_BOOL:{
if (!PyBool_Check(v)) {
PyErr_SetString(PyExc_TypeError,
"attribute value type must be bool");
return -1;
}
if (v == Py_True)
*(char*)addr = (char) 1;
else
*(char*)addr = (char) 0;
break;
}
case T_BYTE:{ case T_BYTE:{
long long_val = PyLong_AsLong(v); long long_val = PyLong_AsLong(v);
if ((long_val == -1) && PyErr_Occurred()) if ((long_val == -1) && PyErr_Occurred())