diff options
| -rw-r--r-- | Doc/c-api/module.rst | 18 | ||||
| -rw-r--r-- | Doc/library/functions.rst | 4 | ||||
| -rw-r--r-- | Doc/library/itertools.rst | 19 | ||||
| -rw-r--r-- | Doc/library/pprint.rst | 3 | ||||
| -rw-r--r-- | Doc/reference/lexical_analysis.rst | 2 | ||||
| -rw-r--r-- | Include/modsupport.h | 3 | ||||
| -rw-r--r-- | Include/pyport.h | 2 | ||||
| -rw-r--r-- | Include/structmember.h | 3 | ||||
| -rw-r--r-- | Lib/ftplib.py | 73 | ||||
| -rw-r--r-- | Lib/pprint.py | 17 | ||||
| -rwxr-xr-x | Lib/pydoc.py | 14 | ||||
| -rw-r--r-- | Lib/site.py | 2 | ||||
| -rw-r--r-- | Lib/test/pydocfodder.py | 6 | ||||
| -rwxr-xr-x | Lib/test/test_grp.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_mmap.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_pwd.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_structmembers.py | 55 | ||||
| -rw-r--r-- | Lib/test/test_threading.py | 18 | ||||
| -rw-r--r-- | Lib/threading.py | 45 | ||||
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Modules/_testcapimodule.c | 66 | ||||
| -rw-r--r-- | Modules/mmapmodule.c | 2 | ||||
| -rw-r--r-- | Parser/tokenizer.c | 2 | ||||
| -rw-r--r-- | Python/structmember.c | 15 |
24 files changed, 270 insertions, 114 deletions
diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst index 9894aca..5ccdc63 100644 --- a/Doc/c-api/module.rst +++ b/Doc/c-api/module.rst @@ -18,12 +18,12 @@ There are only a few functions special to module objects. 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. -.. 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 :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 used from the module's initialization function. The string *value* must be 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*. + diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 5635c70..0126831 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -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 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 diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index 1b5ff81..80fe34d 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -210,7 +210,10 @@ loops that truncate the stream. iterables = [iter(it) for it in iterables) while True: 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]) @@ -252,12 +255,11 @@ loops that truncate the stream. When no iterables are specified, return a zero length iterator. - Note, 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 - ``izip(*[iter(s)]*n)``. For data that doesn't fit n-length groups exactly, the - last tuple can be pre-padded with fill values using ``izip(*[chain(s, - [None]*(n-1))]*n)``. + 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 ``izip(*[iter(s)]*n)``. +<<<<<<< .working Note, when :func:`izip` is used with unequal length inputs, subsequent iteration over the longer iterables cannot reliably be continued after :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` should only be used with unequal length inputs when you don't care about 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]) diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst index 22407ed..6670cf8 100644 --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -22,6 +22,9 @@ width constraint. 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: .. First the implementation class: diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index ae71ec7..3b53d2f 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -502,7 +502,7 @@ Notes: (4) 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) Any Unicode character can be encoded this way, but characters outside the Basic diff --git a/Include/modsupport.h b/Include/modsupport.h index 761d960..d4dddef 100644 --- a/Include/modsupport.h +++ b/Include/modsupport.h @@ -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_AddIntConstant(PyObject *, const char *, long); 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_STRING "1013" diff --git a/Include/pyport.h b/Include/pyport.h index cfc2961..8a92b0e 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -389,7 +389,7 @@ extern "C" { */ #ifndef Py_IS_FINITE #ifdef HAVE_FINITE -#define Py_IS_FINITE(X) finite +#define Py_IS_FINITE(X) finite(X) #else #define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) #endif diff --git a/Include/structmember.h b/Include/structmember.h index acdb84e..0b85b2a 100644 --- a/Include/structmember.h +++ b/Include/structmember.h @@ -54,6 +54,9 @@ typedef struct PyMemberDef { /* Added by Jack: strings contained in the structure */ #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 when the value is NULL, instead of converting to None. */ diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 2df4123..8813d3c 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -32,6 +32,7 @@ python ftplib.py -d localhost -l -p -l # Changes and improvements suggested by Steve Majewski. # Modified by Jack to work on the mac. # Modified by Siebren to support docstrings and PASV. +# Modified by Phil Schwartz to add storbinary and storlines callbacks. # import os @@ -313,7 +314,7 @@ class FTP: expected size may be None if it could not be determined. 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 given marker. """ @@ -376,14 +377,18 @@ class FTP: return resp def retrbinary(self, cmd, callback, blocksize=8192, rest=None): - """Retrieve data in binary mode. - - `cmd' is a RETR command. `callback' is a callback function is - called for each block. No more than `blocksize' number of - bytes will be read from the socket. Optional `rest' is passed - to transfercmd(). - - A new port is created for you. Return the response code. + """Retrieve data in binary mode. A new port is created for you. + + Args: + cmd: A RETR command. + callback: A single parameter callable to be called on each + 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] + + Returns: + The response code. """ self.voidcmd('TYPE I') conn = self.transfercmd(cmd, rest) @@ -396,11 +401,17 @@ class FTP: return self.voidresp() def retrlines(self, cmd, callback = None): - '''Retrieve data in line mode. - The argument is a RETR or LIST command. - The callback function (2nd argument) is called for each line, - with trailing CRLF stripped. This creates a new port for you. - print_line() is the default callback.''' + """Retrieve data in line mode. A new port is created for you. + + Args: + cmd: A RETR, LIST, NLST, or MLSD command. + 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 resp = self.sendcmd('TYPE A') conn = self.transfercmd(cmd) @@ -419,19 +430,42 @@ class FTP: conn.close() return self.voidresp() - def storbinary(self, cmd, fp, blocksize=8192): - '''Store a file in binary mode.''' + def storbinary(self, cmd, fp, blocksize=8192, callback=None): + """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') conn = self.transfercmd(cmd) while 1: buf = fp.read(blocksize) if not buf: break conn.sendall(buf) + if callback: callback(buf) conn.close() return self.voidresp() - def storlines(self, cmd, fp): - '''Store a file in line mode.''' + def storlines(self, cmd, fp, callback=None): + """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') conn = self.transfercmd(cmd) while 1: @@ -441,6 +475,7 @@ class FTP: if buf[-1] in CRLF: buf = buf[:-1] buf = buf + CRLF conn.sendall(buf) + if callback: callback(buf) conn.close() return self.voidresp() @@ -505,7 +540,7 @@ class FTP: def size(self, filename): '''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) if resp[:3] == '213': s = resp[3:].strip() diff --git a/Lib/pprint.py b/Lib/pprint.py index 6449868..09b4a9f 100644 --- a/Lib/pprint.py +++ b/Lib/pprint.py @@ -159,11 +159,24 @@ class PrettyPrinter: write('}') return - if (issubclass(typ, list) and r is list.__repr__) or \ - (issubclass(typ, tuple) and r is tuple.__repr__): + if ((issubclass(typ, list) and r is list.__repr__) or + (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): write('[') 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: write('(') endchar = ')' diff --git a/Lib/pydoc.py b/Lib/pydoc.py index d5fb91b..0542fa5 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1055,9 +1055,11 @@ class TextDoc(Doc): if visiblename(key, all): data.append((key, value)) + modpkgs = [] + modpkgs_names = set() if hasattr(object, '__path__'): - modpkgs = [] for importer, modname, ispkg in pkgutil.iter_modules(object.__path__): + modpkgs_names.add(modname) if ispkg: modpkgs.append(modname + ' (package)') else: @@ -1067,6 +1069,16 @@ class TextDoc(Doc): result = result + self.section( '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: classlist = [value for key, value in classes] contents = [self.formattree( diff --git a/Lib/site.py b/Lib/site.py index 56af90e..fc68317 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -96,6 +96,8 @@ def addbuilddir(): (especially for Guido :-)""" from distutils.util import get_platform 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) sys.path.append(s) diff --git a/Lib/test/pydocfodder.py b/Lib/test/pydocfodder.py index 0ae013b..2530320 100644 --- a/Lib/test/pydocfodder.py +++ b/Lib/test/pydocfodder.py @@ -1,5 +1,7 @@ """Something just to look at via pydoc.""" +import types + class A_classic: "A classic class." def A_method(self): @@ -208,3 +210,7 @@ class FunkyProperties(object): del inst.desc[self.attr] 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""") diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py index 24b3f00..fb607f0 100755 --- a/Lib/test/test_grp.py +++ b/Lib/test/test_grp.py @@ -25,6 +25,9 @@ class GroupDatabaseTestCase(unittest.TestCase): for e in entries: self.check_value(e) + if len(entries) > 1000: # Huge group file (NIS?) -- skip the rest + return + for e in entries: e2 = grp.getgrgid(e.gr_gid) self.check_value(e2) diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index 5bf7eb0..f6ee371 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -419,6 +419,13 @@ class MmapTests(unittest.TestCase): except OSError: 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(): run_unittest(MmapTests) diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py index 358b8b3..19187a3 100644 --- a/Lib/test/test_pwd.py +++ b/Lib/test/test_pwd.py @@ -35,6 +35,9 @@ class PwdTest(unittest.TestCase): entriesbyname.setdefault(e.pw_name, []).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() # for each uid is among those from getpwall() for this uid for e in entries: diff --git a/Lib/test/test_structmembers.py b/Lib/test/test_structmembers.py index 93d7bfb..27b4b70 100644 --- a/Lib/test/test_structmembers.py +++ b/Lib/test/test_structmembers.py @@ -8,52 +8,59 @@ from _testcapi import test_structmembersType, \ import warnings, unittest, sys 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): 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) - ts.T_BYTE=CHAR_MIN + 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) - ts.T_SHORT=SHRT_MAX + 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) - ts.T_USHORT=USHRT_MAX + 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) - ts.T_INT=INT_MIN + 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) - ts.T_LONG=LONG_MAX + 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) - ts.T_ULONG=ULONG_MAX + ts.T_ULONG = ULONG_MAX self.assertEquals(ts.T_ULONG, ULONG_MAX) ## T_LONGLONG and T_ULONGLONG may not be present on some platforms if hasattr(ts, 'T_LONGLONG'): - ts.T_LONGLONG=LLONG_MAX + 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) - ts.T_ULONGLONG=ULLONG_MAX + 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 - ts.T_LONGLONG=3 + ts.T_LONGLONG = 3 self.assertEquals(ts.T_LONGLONG, 3) - ts.T_ULONGLONG=4 + ts.T_ULONGLONG = 4 self.assertEquals(ts.T_ULONGLONG, 4) @@ -63,32 +70,32 @@ class TestWarnings(unittest.TestCase): def test_byte_max(self): with test_support.catch_warning() as w: - ts.T_BYTE=CHAR_MAX+1 + ts.T_BYTE = CHAR_MAX+1 self.has_warned(w) def test_byte_min(self): with test_support.catch_warning() as w: - ts.T_BYTE=CHAR_MIN-1 + ts.T_BYTE = CHAR_MIN-1 self.has_warned(w) def test_ubyte_max(self): with test_support.catch_warning() as w: - ts.T_UBYTE=UCHAR_MAX+1 + ts.T_UBYTE = UCHAR_MAX+1 self.has_warned(w) def test_short_max(self): with test_support.catch_warning() as w: - ts.T_SHORT=SHRT_MAX+1 + ts.T_SHORT = SHRT_MAX+1 self.has_warned(w) def test_short_min(self): with test_support.catch_warning() as w: - ts.T_SHORT=SHRT_MIN-1 + ts.T_SHORT = SHRT_MIN-1 self.has_warned(w) def test_ushort_max(self): with test_support.catch_warning() as w: - ts.T_USHORT=USHRT_MAX+1 + ts.T_USHORT = USHRT_MAX+1 self.has_warned(w) diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 5dd3aea..1ce5950 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -236,6 +236,24 @@ class ThreadTests(unittest.TestCase): """]) 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): # A RuntimeError should be raised if Thread.start() is called # multiple times. diff --git a/Lib/threading.py b/Lib/threading.py index ce95e40..9bd112d 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -346,27 +346,18 @@ class _Event(_Verbose): return self._flag def set(self): - self._cond.acquire() - try: + with self._cond: self._flag = True self._cond.notifyAll() - finally: - self._cond.release() def clear(self): - self._cond.acquire() - try: + with self._cond: self._flag = False - finally: - self._cond.release() def wait(self, timeout=None): - self._cond.acquire() - try: + with self._cond: if not self._flag: self._cond.wait(timeout) - finally: - self._cond.release() # Helper to generate new thread names _counter = 0 @@ -523,17 +514,19 @@ class Thread(_Verbose): if __debug__: self._note("%s.__bootstrap(): normal return", self) finally: - self._stop() - try: - self._delete() - except: - pass + with _active_limbo_lock: + self._stop() + try: + # We don't call self.__delete() because it also + # grabs _active_limbo_lock. + del _active[_get_ident()] + except: + pass def _stop(self): - self._block.acquire() - self._stopped = True - self._block.notifyAll() - self._block.release() + with self._block: + self._stopped = True + self._block.notifyAll() def _delete(self): "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 # hide the exception. - _active_limbo_lock.acquire() - try: + with _active_limbo_lock: try: del _active[_get_ident()] except KeyError: if 'dummy_threading' not in _sys.modules: raise - finally: - _active_limbo_lock.release() def join(self, timeout=None): if not self._initialized: @@ -580,8 +570,7 @@ class Thread(_Verbose): if __debug__: if not self._stopped: self._note("%s.join(): waiting until thread stops", self) - self._block.acquire() - try: + with self._block: if timeout is None: while not self._stopped: self._block.wait() @@ -599,8 +588,6 @@ class Thread(_Verbose): else: if __debug__: self._note("%s.join(): thread stopped", self) - finally: - self._block.release() def getName(self): assert self._initialized, "Thread.__init__() not called" diff --git a/Makefile.pre.in b/Makefile.pre.in index 406478c..8cbde80 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -360,7 +360,7 @@ platform: $(BUILDPYTHON) # Build the shared modules sharedmods: $(BUILDPYTHON) @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;; \ esac diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index d89a513..c462d69 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -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);} typedef struct { + char bool_member; char byte_member; unsigned char ubyte_member; short short_member; @@ -952,6 +953,7 @@ typedef struct { } test_structmembers; 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_UBYTE", T_UBYTE, offsetof(test_structmembers, structmembers.ubyte_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 char *keywords[]={"T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT", "T_INT", "T_UINT", - "T_LONG", "T_ULONG", "T_FLOAT", "T_DOUBLE", - #ifdef HAVE_LONG_LONG +static PyObject * +test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) +{ + 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", - #endif +#endif NULL}; - static char *fmt="|bBhHiIlkfd" - #ifdef HAVE_LONG_LONG + static char *fmt = "|bbBhHiIlkfd" +#ifdef HAVE_LONG_LONG "LK" - #endif +#endif ; - test_structmembers *ob=PyObject_New(test_structmembers, type); - if (ob==NULL) + test_structmembers *ob; + ob = PyObject_New(test_structmembers, type); + if (ob == NULL) return NULL; memset(&ob->structmembers, 0, sizeof(all_structmembers)); if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, keywords, - &ob->structmembers.byte_member, &ob->structmembers.ubyte_member, - &ob->structmembers.short_member, &ob->structmembers.ushort_member, - &ob->structmembers.int_member, &ob->structmembers.uint_member, - &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 - )){ + &ob->structmembers.bool_member, + &ob->structmembers.byte_member, + &ob->structmembers.ubyte_member, + &ob->structmembers.short_member, + &ob->structmembers.ushort_member, + &ob->structmembers.int_member, + &ob->structmembers.uint_member, + &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); return NULL; - } + } return (PyObject *)ob; } -static void test_structmembers_free(PyObject *ob){ +static void +test_structmembers_free(PyObject *ob) +{ PyObject_FREE(ob); } @@ -1023,8 +1039,8 @@ static PyTypeObject test_structmembersType = { 0, /* tp_hash */ 0, /* tp_call */ 0, /* tp_str */ - PyObject_GenericGetAttr, - PyObject_GenericSetAttr, + PyObject_GenericGetAttr, /* tp_getattro */ + PyObject_GenericSetAttr, /* tp_setattro */ 0, /* tp_as_buffer */ 0, /* tp_flags */ "Type containing all structmember types", @@ -1035,7 +1051,7 @@ static PyTypeObject test_structmembersType = { 0, /* tp_iter */ 0, /* tp_iternext */ 0, /* tp_methods */ - test_members, /* tp_members */ + test_members, /* tp_members */ 0, 0, 0, @@ -1044,7 +1060,7 @@ static PyTypeObject test_structmembersType = { 0, 0, 0, - test_structmembers_new, /* tp_new */ + test_structmembers_new, /* tp_new */ }; diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index ac39a23..f50347c 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -130,7 +130,7 @@ mmap_object_dealloc(mmap_object *m_obj) } #endif /* UNIX */ - PyObject_Del(m_obj); + Py_TYPE(m_obj)->tp_free((PyObject*)m_obj); } static PyObject * diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 36ea466..991d760 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -640,7 +640,7 @@ decode_str(const char *str, struct tok_state *tok) { PyObject* utf8 = NULL; const char *s; - char *newl[2] = {NULL, NULL}; + const char *newl[2] = {NULL, NULL}; int lineno = 0; tok->enc = NULL; tok->str = str; diff --git a/Python/structmember.c b/Python/structmember.c index f8588cc..769acfc 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -12,6 +12,9 @@ PyMember_GetOne(const char *addr, PyMemberDef *l) addr += l->offset; switch (l->type) { + case T_BOOL: + v = PyBool_FromLong(*(char*)addr); + break; case T_BYTE: v = PyLong_FromLong(*(char*)addr); break; @@ -113,6 +116,18 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) } addr += l->offset; 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:{ long long_val = PyLong_AsLong(v); if ((long_val == -1) && PyErr_Occurred()) |