From 04110fb8594c969ca187a968a35a59263ddf7209 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 24 Aug 2007 16:32:05 +0000 Subject: Merged revisions 57221-57391 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r57227 | facundo.batista | 2007-08-20 17:16:21 -0700 (Mon, 20 Aug 2007) | 5 lines Catch ProtocolError exceptions and include the header information in test output (to make it easier to debug test failures caused by problems in the server). [GSoC - Alan McIntyre] ........ r57229 | mark.hammond | 2007-08-20 18:04:47 -0700 (Mon, 20 Aug 2007) | 5 lines [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. ........ r57230 | mark.hammond | 2007-08-20 18:05:16 -0700 (Mon, 20 Aug 2007) | 5 lines [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. ........ r57253 | georg.brandl | 2007-08-20 23:01:18 -0700 (Mon, 20 Aug 2007) | 2 lines Demand version 2.5.1 since 2.5 has a bug with codecs.open context managers. ........ r57254 | georg.brandl | 2007-08-20 23:03:43 -0700 (Mon, 20 Aug 2007) | 2 lines Revert accidental checkins from last commit. ........ r57255 | georg.brandl | 2007-08-20 23:07:08 -0700 (Mon, 20 Aug 2007) | 2 lines Bug #1777160: mention explicitly that e.g. -1**2 is -1. ........ r57256 | georg.brandl | 2007-08-20 23:12:19 -0700 (Mon, 20 Aug 2007) | 3 lines Bug #1777168: replace operator names "opa"... with "op1"... and mark everything up as literal, to enhance readability. ........ r57259 | facundo.batista | 2007-08-21 09:57:18 -0700 (Tue, 21 Aug 2007) | 8 lines Added test for behavior of operations on an unconnected SMTP object, and tests for NOOP, RSET, and VRFY. Corrected typo in a comment for testNonnumericPort. Added a check for constructing SMTP objects when non-numeric ports are included in the host name. Derived a server from SMTPServer to test various ESMTP/SMTP capabilities. Check that a second HELO to DebuggingServer returns an error. [GSoC - Alan McIntyre] ........ r57279 | skip.montanaro | 2007-08-22 12:02:16 -0700 (Wed, 22 Aug 2007) | 2 lines Note that BeOS is unsupported as of Python 2.6. ........ r57280 | skip.montanaro | 2007-08-22 12:05:21 -0700 (Wed, 22 Aug 2007) | 1 line whoops - need to check in configure as well ........ r57284 | alex.martelli | 2007-08-22 14:14:17 -0700 (Wed, 22 Aug 2007) | 5 lines Fix compile.c so that it records 0.0 and -0.0 as separate constants in a code object's co_consts tuple; add a test to show that the previous behavior (where these two constants were "collapsed" into one) causes serious malfunctioning. ........ r57286 | gregory.p.smith | 2007-08-22 14:32:34 -0700 (Wed, 22 Aug 2007) | 3 lines stop leaving log.0000001 __db.00* and xxx.db turds in developer sandboxes when bsddb3 tests are run. ........ r57301 | jeffrey.yasskin | 2007-08-22 16:14:27 -0700 (Wed, 22 Aug 2007) | 3 lines When setup.py fails to find the necessary bits to build some modules, have it print a slightly more informative message. ........ r57320 | brett.cannon | 2007-08-23 07:53:17 -0700 (Thu, 23 Aug 2007) | 2 lines Make test_runpy re-entrant. ........ r57324 | georg.brandl | 2007-08-23 10:54:11 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1768121: fix wrong/missing opcode docs. ........ r57326 | georg.brandl | 2007-08-23 10:57:05 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1766421: "return code" vs. "status code". ........ r57328 | georg.brandl | 2007-08-23 11:08:06 -0700 (Thu, 23 Aug 2007) | 2 lines Second half of #1752175: #ifdef out references to PyImport_DynLoadFiletab if HAVE_DYNAMIC_LOADING is not defined. ........ r57331 | georg.brandl | 2007-08-23 11:11:33 -0700 (Thu, 23 Aug 2007) | 2 lines Use try-except-finally in contextlib. ........ r57343 | georg.brandl | 2007-08-23 13:35:00 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1697820: document that the old slice protocol is still used by builtin types. ........ r57345 | georg.brandl | 2007-08-23 13:40:01 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1573854: fix docs for sqlite3 cursor rowcount attr. ........ r57347 | georg.brandl | 2007-08-23 13:50:23 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1694833: fix imp.find_module() docs wrt. packages. ........ r57348 | georg.brandl | 2007-08-23 13:53:28 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1594966: fix misleading usage example ........ r57349 | georg.brandl | 2007-08-23 13:55:44 -0700 (Thu, 23 Aug 2007) | 2 lines Clarify wording a bit. ........ r57351 | georg.brandl | 2007-08-23 14:18:44 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1752332: httplib no longer uses socket.getaddrinfo(). ........ r57352 | georg.brandl | 2007-08-23 14:21:36 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1734111: document struct.Struct.size. ........ r57353 | georg.brandl | 2007-08-23 14:27:57 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1688564: document os.path.join's absolute path behavior in the docstring. ........ r57354 | georg.brandl | 2007-08-23 14:36:05 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1625381: clarify match vs search introduction. ........ r57355 | georg.brandl | 2007-08-23 14:42:54 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1758696: more info about descriptors. ........ r57357 | georg.brandl | 2007-08-23 14:55:57 -0700 (Thu, 23 Aug 2007) | 2 lines Patch #1779550: remove redundant code in logging. ........ r57378 | gregory.p.smith | 2007-08-23 22:11:38 -0700 (Thu, 23 Aug 2007) | 2 lines Fix bug 1725856. ........ r57382 | georg.brandl | 2007-08-23 23:10:01 -0700 (Thu, 23 Aug 2007) | 2 lines uuid creation is now threadsafe, backport from py3k rev. 57375. ........ r57389 | georg.brandl | 2007-08-24 04:47:37 -0700 (Fri, 24 Aug 2007) | 2 lines Bug #1765375: fix stripping of unwanted LDFLAGS. ........ r57391 | guido.van.rossum | 2007-08-24 07:53:14 -0700 (Fri, 24 Aug 2007) | 2 lines Fix silly typo in test name. ........ --- Doc/library/dis.rst | 30 ++++-- Doc/library/doctest.rst | 20 +--- Doc/library/imp.rst | 96 +++++++++-------- Doc/library/re.rst | 10 +- Doc/library/socket.rst | 2 +- Doc/library/sqlite3.rst | 6 +- Doc/library/struct.rst | 5 + Doc/reference/datamodel.rst | 16 ++- Doc/reference/expressions.rst | 12 +-- Doc/tools/sphinx-build.py | 4 +- Lib/contextlib.py | 17 ++- Lib/distutils/command/bdist_msi.py | 5 +- Lib/distutils/util.py | 21 +++- Lib/logging/__init__.py | 18 +--- Lib/ntpath.py | 4 +- Lib/posixpath.py | 4 +- Lib/smtplib.py | 3 +- Lib/test/test_datetime.py | 2 +- Lib/test/test_float.py | 15 +++ Lib/test/test_runpy.py | 3 +- Lib/test/test_smtplib.py | 205 +++++++++++++++++++++++++++++++++++-- Lib/test/test_xmlrpc.py | 77 +++++++++----- Python/compile.c | 15 ++- Python/import.c | 6 +- setup.py | 8 +- 25 files changed, 447 insertions(+), 157 deletions(-) diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst index 5f28473..7ce864d 100644 --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -474,10 +474,29 @@ Miscellaneous opcodes. Creates a new class object. TOS is the methods dictionary, TOS1 the tuple of the names of the base classes, and TOS2 the class name. + +.. opcode:: WITH_CLEANUP () + + Cleans up the stack when a :keyword:`with` statement block exits. TOS is the + context manager's :meth:`__exit__` bound method. Below that are 1--3 values + indicating how/why the finally clause was entered: + + * SECOND = None + * (SECOND, THIRD) = (WHY_{RETURN,CONTINUE}), retval + * SECOND = WHY_\*; no retval below it + * (SECOND, THIRD, FOURTH) = exc_info() + + In the last case, ``TOS(SECOND, THIRD, FOURTH)`` is called, otherwise + ``TOS(None, None, None)``. + + In addition, if the stack represents an exception, *and* the function call + returns a 'true' value, this information is "zapped", to prevent ``END_FINALLY`` + from re-raising the exception. (But non-local gotos should still be resumed.) + + All of the following opcodes expect arguments. An argument is two bytes, with the more significant byte last. - .. opcode:: STORE_NAME (namei) Implements ``name = TOS``. *namei* is the index of *name* in the attribute @@ -722,11 +741,10 @@ the more significant byte last. .. opcode:: MAKE_CLOSURE (argc) - Creates a new function object, sets its *__closure__* slot, and pushes it on the - stack. TOS is the code associated with the function. If the code object has N - free variables, the next N items on the stack are the cells for these variables. - The function also has *argc* default parameters, where are found before the - cells. + Creates a new function object, sets its *__closure__* slot, and pushes it on + the stack. TOS is the code associated with the function, TOS1 the tuple + containing cells for the closure's free variables. The function also has + *argc* default parameters, which are found below the cells. .. opcode:: BUILD_SLICE (argc) diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst index 23f96e4..4f4f511 100644 --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -69,11 +69,6 @@ Here's a complete but small example module:: OverflowError: n too large """ - -.. % allow LaTeX to break here. - -:: - import math if not n >= 0: raise ValueError("n must be >= 0") @@ -88,12 +83,10 @@ Here's a complete but small example module:: factor += 1 return result - def _test(): - import doctest - doctest.testmod() if __name__ == "__main__": - _test() + import doctest + doctest.testmod() If you run :file:`example.py` directly from the command line, :mod:`doctest` works its magic:: @@ -131,12 +124,10 @@ And so on, eventually ending with:: ... OverflowError: n too large ok - 1 items had no tests: - __main__._test 2 items passed all tests: 1 tests in __main__ 8 tests in __main__.factorial - 9 tests in 3 items. + 9 tests in 2 items. 9 passed and 0 failed. Test passed. $ @@ -156,13 +147,10 @@ Simple Usage: Checking Examples in Docstrings The simplest way to start using doctest (but not necessarily the way you'll continue to do it) is to end each module :mod:`M` with:: - def _test(): + if __name__ == "__main__": import doctest doctest.testmod() - if __name__ == "__main__": - _test() - :mod:`doctest` then examines docstrings in module :mod:`M`. Running the module as a script causes the examples in the docstrings to get diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst index f80bea3..7943604 100644 --- a/Doc/library/imp.rst +++ b/Doc/library/imp.rst @@ -22,63 +22,73 @@ This module provides an interface to the mechanisms used to implement the .. function:: get_suffixes() - Return a list of triples, each describing a particular type of module. Each - triple has the form ``(suffix, mode, type)``, where *suffix* is a string to be - appended to the module name to form the filename to search for, *mode* is the - mode string to pass to the built-in :func:`open` function to open the file (this - can be ``'r'`` for text files or ``'rb'`` for binary files), and *type* is the - file type, which has one of the values :const:`PY_SOURCE`, :const:`PY_COMPILED`, - or :const:`C_EXTENSION`, described below. + Return a list of 3-element tuples, each describing a particular type of + module. Each triple has the form ``(suffix, mode, type)``, where *suffix* is + a string to be appended to the module name to form the filename to search + for, *mode* is the mode string to pass to the built-in :func:`open` function + to open the file (this can be ``'r'`` for text files or ``'rb'`` for binary + files), and *type* is the file type, which has one of the values + :const:`PY_SOURCE`, :const:`PY_COMPILED`, or :const:`C_EXTENSION`, described + below. .. function:: find_module(name[, path]) - Try to find the module *name* on the search path *path*. If *path* is a list of - directory names, each directory is searched for files with any of the suffixes - returned by :func:`get_suffixes` above. Invalid names in the list are silently - ignored (but all list items must be strings). If *path* is omitted or ``None``, - the list of directory names given by ``sys.path`` is searched, but first it - searches a few special places: it tries to find a built-in module with the given - name (:const:`C_BUILTIN`), then a frozen module (:const:`PY_FROZEN`), and on - some systems some other places are looked in as well (on the Mac, it looks for a - resource (:const:`PY_RESOURCE`); on Windows, it looks in the registry which may - point to a specific file). - - If search is successful, the return value is a triple ``(file, pathname, - description)`` where *file* is an open file object positioned at the beginning, - *pathname* is the pathname of the file found, and *description* is a triple as + Try to find the module *name* on the search path *path*. If *path* is a list + of directory names, each directory is searched for files with any of the + suffixes returned by :func:`get_suffixes` above. Invalid names in the list + are silently ignored (but all list items must be strings). If *path* is + omitted or ``None``, the list of directory names given by ``sys.path`` is + searched, but first it searches a few special places: it tries to find a + built-in module with the given name (:const:`C_BUILTIN`), then a frozen + module (:const:`PY_FROZEN`), and on some systems some other places are looked + in as well (on the Mac, it looks for a resource (:const:`PY_RESOURCE`); on + Windows, it looks in the registry which may point to a specific file). + + If search is successful, the return value is a 3-element tuple ``(file, + pathname, description)``: + + *file* is an open file object positioned at the beginning, *pathname* is the + pathname of the file found, and *description* is a 3-element tuple as contained in the list returned by :func:`get_suffixes` describing the kind of - module found. If the module does not live in a file, the returned *file* is - ``None``, *filename* is the empty string, and the *description* tuple contains - empty strings for its suffix and mode; the module type is as indicate in - parentheses above. If the search is unsuccessful, :exc:`ImportError` is raised. - Other exceptions indicate problems with the arguments or environment. - - This function does not handle hierarchical module names (names containing dots). - In order to find *P*.*M*, that is, submodule *M* of package *P*, use + module found. + + If the module does not live in a file, the returned *file* is ``None``, + *pathname* is the empty string, and the *description* tuple contains empty + strings for its suffix and mode; the module type is indicated as given in + parentheses above. If the search is unsuccessful, :exc:`ImportError` is + raised. Other exceptions indicate problems with the arguments or + environment. + + If the module is a package, *file* is ``None``, *pathname* is the package + path and the last item in the *description* tuple is :const:`PKG_DIRECTORY`. + + This function does not handle hierarchical module names (names containing + dots). In order to find *P*.*M*, that is, submodule *M* of package *P*, use :func:`find_module` and :func:`load_module` to find and load package *P*, and then use :func:`find_module` with the *path* argument set to ``P.__path__``. When *P* itself has a dotted name, apply this recipe recursively. -.. function:: load_module(name, file, filename, description) +.. function:: load_module(name, file, pathname, description) Load a module that was previously found by :func:`find_module` (or by an otherwise conducted search yielding compatible results). This function does more than importing the module: if the module was already imported, it will - reload the module! The *name* argument indicates the full module name (including - the package name, if this is a submodule of a package). The *file* argument is - an open file, and *filename* is the corresponding file name; these can be - ``None`` and ``''``, respectively, when the module is not being loaded from a - file. The *description* argument is a tuple, as would be returned by - :func:`get_suffixes`, describing what kind of module must be loaded. - - If the load is successful, the return value is the module object; otherwise, an - exception (usually :exc:`ImportError`) is raised. - - **Important:** the caller is responsible for closing the *file* argument, if it - was not ``None``, even when an exception is raised. This is best done using a - :keyword:`try` ... :keyword:`finally` statement. + reload the module! The *name* argument indicates the full + module name (including the package name, if this is a submodule of a + package). The *file* argument is an open file, and *pathname* is the + corresponding file name; these can be ``None`` and ``''``, respectively, when + the module is a package or not being loaded from a file. The *description* + argument is a tuple, as would be returned by :func:`get_suffixes`, describing + what kind of module must be loaded. + + If the load is successful, the return value is the module object; otherwise, + an exception (usually :exc:`ImportError`) is raised. + + **Important:** the caller is responsible for closing the *file* argument, if + it was not ``None``, even when an exception is raised. This is best done + using a :keyword:`try` ... :keyword:`finally` statement. .. function:: new_module(name) diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 027ff16..d5abcdd 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -393,12 +393,12 @@ Matching vs Searching Python offers two different primitive operations based on regular expressions: -match and search. If you are accustomed to Perl's semantics, the search -operation is what you're looking for. See the :func:`search` function and -corresponding method of compiled regular expression objects. +**match** checks for a match only at the beginning of the string, while +**search** checks for a match anywhere in the string (this is what Perl does +by default). -Note that match may differ from search using a regular expression beginning with -``'^'``: ``'^'`` matches only at the start of the string, or in +Note that match may differ from search even when using a regular expression +beginning with ``'^'``: ``'^'`` matches only at the start of the string, or in :const:`MULTILINE` mode also immediately following a newline. The "match" operation succeeds only if the pattern matches at the start of the string regardless of mode, or at the starting position given by the optional *pos* diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index 68a32fe..46774a3 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -197,7 +197,7 @@ The module :mod:`socket` exports the following constants and functions: :func:`socket` function. *canonname* is a string representing the canonical name of the *host*. It can be a numeric IPv4/v6 address when :const:`AI_CANONNAME` is specified for a numeric *host*. *sockaddr* is a tuple describing a socket - address, as described above. See the source for the :mod:`httplib` and other + address, as described above. See the source for :mod:`socket` and other library modules for a typical usage of the function. .. versionadded:: 2.2 diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index 707092b..bee32e6 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -440,9 +440,6 @@ A :class:`Cursor` instance has the following attributes and methods: attribute, the database engine's own support for the determination of "rows affected"/"rows selected" is quirky. - For ``SELECT`` statements, :attr:`rowcount` is always None because we cannot - determine the number of rows a query produced until all rows were fetched. - For ``DELETE`` statements, SQLite reports :attr:`rowcount` as 0 if you make a ``DELETE FROM table`` without any condition. @@ -453,6 +450,9 @@ A :class:`Cursor` instance has the following attributes and methods: case no executeXX() has been performed on the cursor or the rowcount of the last operation is not determinable by the interface". + This includes ``SELECT`` statements because we cannot determine the number of + rows a query produced until all rows were fetched. + .. _sqlite3-types: diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst index 2f27d13..9cf4eb2 100644 --- a/Doc/library/struct.rst +++ b/Doc/library/struct.rst @@ -290,3 +290,8 @@ Compiled Struct objects support the following methods and attributes: The format string used to construct this Struct object. +.. attribute:: Struct.size + + The calculated size of the struct (and hence of the string) corresponding + to :attr:`format`. + diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 2f6013e..baa6eaa 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1544,11 +1544,11 @@ Super Binding ``A.__dict__['m'].__get__(obj, A)``. For instance bindings, the precedence of descriptor invocation depends on the -which descriptor methods are defined. Data descriptors define both -:meth:`__get__` and :meth:`__set__`. Non-data descriptors have just the +which descriptor methods are defined. Normally, data descriptors define both +:meth:`__get__` and :meth:`__set__`, while non-data descriptors have just the :meth:`__get__` method. Data descriptors always override a redefinition in an instance dictionary. In contrast, non-data descriptors can be overridden by -instances. +instances. [#]_ Python methods (including :func:`staticmethod` and :func:`classmethod`) are implemented as non-data descriptors. Accordingly, instances can redefine and @@ -1817,6 +1817,9 @@ objects. Immutable sequences methods should at most only define .. deprecated:: 2.0 Support slice objects as parameters to the :meth:`__getitem__` method. + (However, built-in types in CPython currently still implement + :meth:`__getslice__`. Therefore, you have to override it in derived + classes when implementing slicing.) Called to implement evaluation of ``self[i:j]``. The returned object should be of the same type as *self*. Note that missing *i* or *j* in the slice @@ -2112,6 +2115,13 @@ For more information on context managers, see :ref:`typecontextmanager`. .. [#] This, and other statements, are only roughly true for instances of new-style classes. +.. [#] A descriptor can define any combination of :meth:`__get__`, + :meth:`__set__` and :meth:`__delete__`. If it does not define :meth:`__get__`, + then accessing the attribute even on an instance will return the descriptor + object itself. If the descriptor defines :meth:`__set__` and/or + :meth:`__delete__`, it is a data descriptor; if it defines neither, it is a + non-data descriptor. + .. [#] For operands of the same type, it is assumed that if the non-reflected method (such as :meth:`__add__`) fails the operation is not supported, which is why the reflected method is not called. diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 476c82d..ef71a80 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -741,7 +741,7 @@ less tightly than unary operators on its right. The syntax is: Thus, in an unparenthesized sequence of power and unary operators, the operators are evaluated from right to left (this does not constrain the evaluation order -for the operands). +for the operands): ``-1**2`` results in ``-1``. The power operator has the same semantics as the built-in :func:`pow` function, when called with two arguments: it yields its left argument raised to the power @@ -959,12 +959,12 @@ Comparisons can be chained arbitrarily, e.g., ``x < y <= z`` is equivalent to ``x < y and y <= z``, except that ``y`` is evaluated only once (but in both cases ``z`` is not evaluated at all when ``x < y`` is found to be false). -Formally, if *a*, *b*, *c*, ..., *y*, *z* are expressions and *opa*, *opb*, ..., -*opy* are comparison operators, then *a opa b opb c* ...*y opy z* is equivalent -to *a opa b* :keyword:`and` *b opb c* :keyword:`and` ... *y opy z*, except that -each expression is evaluated at most once. +Formally, if *a*, *b*, *c*, ..., *y*, *z* are expressions and *op1*, *op2*, ..., +*opN* are comparison operators, then ``a op1 b op2 c ... y opN z`` is equivalent +to ``a op1 b and b op2 c and ... y opN z``, except that each expression is +evaluated at most once. -Note that *a opa b opb c* doesn't imply any kind of comparison between *a* and +Note that ``a op1 b op2 c`` doesn't imply any kind of comparison between *a* and *c*, so that, e.g., ``x < y > z`` is perfectly legal (though perhaps not pretty). diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py index e19b10a..8f952be 100644 --- a/Doc/tools/sphinx-build.py +++ b/Doc/tools/sphinx-build.py @@ -11,9 +11,9 @@ import sys if __name__ == '__main__': - if sys.version_info[:3] < (2, 5, 0): + if sys.version_info[:3] < (2, 5, 1): print >>sys.stderr, """\ -Error: Sphinx needs to be executed with Python 2.5 or newer +Error: Sphinx needs to be executed with Python 2.5.1 or newer (If you run this from the Makefile, you can set the PYTHON variable to the path of an alternative interpreter executable, e.g., ``make html PYTHON=python2.5``). diff --git a/Lib/contextlib.py b/Lib/contextlib.py index 6605bea..bc810b0 100644 --- a/Lib/contextlib.py +++ b/Lib/contextlib.py @@ -105,15 +105,14 @@ def nested(*managers): vars = [] exc = (None, None, None) try: - try: - for mgr in managers: - exit = mgr.__exit__ - enter = mgr.__enter__ - vars.append(enter()) - exits.append(exit) - yield vars - except: - exc = sys.exc_info() + for mgr in managers: + exit = mgr.__exit__ + enter = mgr.__enter__ + vars.append(enter()) + exits.append(exit) + yield vars + except: + exc = sys.exc_info() finally: while exits: exit = exits.pop() diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py index 012d06e..5225bed 100644 --- a/Lib/distutils/command/bdist_msi.py +++ b/Lib/distutils/command/bdist_msi.py @@ -633,7 +633,8 @@ class bdist_msi (Command): def get_installer_filename(self, fullname): # Factored out to allow overriding in subclasses + plat = get_platform() installer_name = os.path.join(self.dist_dir, - "%s.win32-py%s.msi" % - (fullname, self.target_version)) + "%s.%s-py%s.msi" % + (fullname, plat, self.target_version)) return installer_name diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 6f15ce8..9aa8570 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -29,8 +29,27 @@ def get_platform (): irix-5.3 irix64-6.2 - For non-POSIX platforms, currently just returns 'sys.platform'. + Windows will return one of: + win-x86_64 (64bit Windows on x86_64 (AMD64)) + win-ia64 (64bit Windows on Itanium) + win32 (all others - specifically, sys.platform is returned) + + For other non-POSIX platforms, currently just returns 'sys.platform'. """ + if os.name == 'nt': + # sniff sys.version for architecture. + prefix = " bit (" + i = string.find(sys.version, prefix) + if i == -1: + return sys.platform + j = string.find(sys.version, ")", i) + look = sys.version[i+len(prefix):j].lower() + if look=='amd64': + return 'win-x86_64' + if look=='itanium': + return 'win-ia64' + return sys.platform + if os.name != "posix" or not hasattr(os, 'uname'): # XXX what about the architecture? NT is Intel or Alpha, # Mac OS is M68k or PPC, etc. diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 229be69..ef78422 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -975,9 +975,7 @@ class Logger(Filterer): logger.debug("Houston, we have a %s", "thorny problem", exc_info=1) """ - if self.manager.disable >= DEBUG: - return - if DEBUG >= self.getEffectiveLevel(): + if self.isEnabledFor(DEBUG): self._log(DEBUG, msg, args, **kwargs) def info(self, msg, *args, **kwargs): @@ -989,9 +987,7 @@ class Logger(Filterer): logger.info("Houston, we have a %s", "interesting problem", exc_info=1) """ - if self.manager.disable >= INFO: - return - if INFO >= self.getEffectiveLevel(): + if self.isEnabledFor(INFO): self._log(INFO, msg, args, **kwargs) def warning(self, msg, *args, **kwargs): @@ -1003,8 +999,6 @@ class Logger(Filterer): logger.warning("Houston, we have a %s", "bit of a problem", exc_info=1) """ - if self.manager.disable >= WARNING: - return if self.isEnabledFor(WARNING): self._log(WARNING, msg, args, **kwargs) @@ -1019,8 +1013,6 @@ class Logger(Filterer): logger.error("Houston, we have a %s", "major problem", exc_info=1) """ - if self.manager.disable >= ERROR: - return if self.isEnabledFor(ERROR): self._log(ERROR, msg, args, **kwargs) @@ -1039,9 +1031,7 @@ class Logger(Filterer): logger.critical("Houston, we have a %s", "major disaster", exc_info=1) """ - if self.manager.disable >= CRITICAL: - return - if CRITICAL >= self.getEffectiveLevel(): + if self.isEnabledFor(CRITICAL): self._log(CRITICAL, msg, args, **kwargs) fatal = critical @@ -1060,8 +1050,6 @@ class Logger(Filterer): raise TypeError, "level must be an integer" else: return - if self.manager.disable >= level: - return if self.isEnabledFor(level): self._log(level, msg, args, **kwargs) diff --git a/Lib/ntpath.py b/Lib/ntpath.py index 99d7a4a..06b2293 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -59,7 +59,9 @@ def isabs(s): # Join two (or more) paths. def join(a, *p): - """Join two or more pathname components, inserting "\\" as needed""" + """Join two or more pathname components, inserting "\\" as needed. + If any component is an absolute path, all previous path components + will be discarded.""" path = a for b in p: b_wins = 0 # set to 1 iff b makes path irrelevant diff --git a/Lib/posixpath.py b/Lib/posixpath.py index 6f15d48..6d4a9e2 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -56,7 +56,9 @@ def isabs(s): # Insert a '/' unless the first part is empty or already ends in '/'. def join(a, *p): - """Join two or more pathname components, inserting '/' as needed""" + """Join two or more pathname components, inserting '/' as needed. + If any component is an absolute path, all previous path components + will be discarded.""" path = a for b in p: if b.startswith('/'): diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 0d61f50..301f4fe 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -401,7 +401,8 @@ class SMTP: return (code,msg) self.does_esmtp=1 #parse the ehlo response -ddm - resp=self.ehlo_resp.split('\n') + assert isinstance(self.ehlo_resp, bytes), repr(self.ehlo_resp) + resp=self.ehlo_resp.decode("latin-1").split('\n') del resp[0] for each in resp: # To be able to communicate with as many SMTP servers as possible, diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index c0a96ef..b26c92e 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -1003,7 +1003,7 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase): self.failUnless(self.theclass.min) self.failUnless(self.theclass.max) - def test_srftime_out_of_range(self): + def test_strftime_out_of_range(self): # For nasty technical reasons, we can't handle years before 1900. cls = self.theclass self.assertEqual(cls(1900, 1, 1).strftime("%Y"), "1900") diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index 4f4cffd..48abec9 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -81,6 +81,7 @@ class UnknownFormatTestCase(unittest.TestCase): # on an IEEE platform, all we guarantee is that bit patterns # representing infinities or NaNs do not raise an exception; all else # is accident (today). +# let's also try to guarantee that -0.0 and 0.0 don't get confused. class IEEEFormatTestCase(unittest.TestCase): if float.__getformat__("double").startswith("IEEE"): @@ -99,6 +100,20 @@ class IEEEFormatTestCase(unittest.TestCase): (' 0: + time.sleep(0.01) + n -= 1 + + # wait a little longer (sometimes connections are refused + # on slow machines without this additional wait) + time.sleep(0.5) + + def tearDown(self): + # indicate that the client is finished + self.client_evt.set() + # wait for the server thread to terminate + self.serv_evt.wait() + + def testBasic(self): + # smoke test + smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3) + smtp.quit() + + def testEHLO(self): + smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3) + + # no features should be present before the EHLO + self.assertEqual(smtp.esmtp_features, {}) + + # features expected from the test server + expected_features = {'expn':'', + 'size': '20000000', + 'starttls': '', + 'deliverby': '', + 'help': '', + } + + smtp.ehlo() + self.assertEqual(smtp.esmtp_features, expected_features) + for k in expected_features: + self.assertTrue(smtp.has_extn(k)) + self.assertFalse(smtp.has_extn('unsupported-feature')) + smtp.quit() + + def testVRFY(self): + smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3) + + for email, name in sim_users.items(): + expected_known = (250, bytes('%s %s' % + (name, smtplib.quoteaddr(email)))) + self.assertEqual(smtp.vrfy(email), expected_known) + + u = 'nobody@nowhere.com' + expected_unknown = (550, bytes('No such user: %s' + % smtplib.quoteaddr(u))) + self.assertEqual(smtp.vrfy(u), expected_unknown) + smtp.quit() + + def testEXPN(self): + smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3) + + for listname, members in sim_lists.items(): + users = [] + for m in members: + users.append('%s %s' % (sim_users[m], smtplib.quoteaddr(m))) + expected_known = (250, bytes('\n'.join(users))) + self.assertEqual(smtp.expn(listname), expected_known) + + u = 'PSU-Members-List' + expected_unknown = (550, b'No access for you!') + self.assertEqual(smtp.expn(u), expected_unknown) + smtp.quit() + + + def test_main(verbose=None): test_support.run_unittest(GeneralTests, DebuggingServerTests, - BadHELOServerTests) + BadHELOServerTests, SMTPSimTests) if __name__ == '__main__': test_main() diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py index 7dfabcf..18e130d 100644 --- a/Lib/test/test_xmlrpc.py +++ b/Lib/test/test_xmlrpc.py @@ -303,38 +303,58 @@ class SimpleServerTestCase(unittest.TestCase): SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header = False def test_simple1(self): - p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) - self.assertEqual(p.pow(6,8), 6**8) + try: + p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) + self.assertEqual(p.pow(6,8), 6**8) + except xmlrpclib.ProtocolError, e: + # protocol error; provide additional information in test output + self.fail("%s\n%s" % (e, e.headers)) def test_introspection1(self): - p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) - meth = p.system.listMethods() - expected_methods = set(['pow', 'div', 'add', 'system.listMethods', - 'system.methodHelp', 'system.methodSignature', 'system.multicall']) - self.assertEqual(set(meth), expected_methods) + try: + p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) + meth = p.system.listMethods() + expected_methods = set(['pow', 'div', 'add', 'system.listMethods', + 'system.methodHelp', 'system.methodSignature', 'system.multicall']) + self.assertEqual(set(meth), expected_methods) + except xmlrpclib.ProtocolError, e: + # protocol error; provide additional information in test output + self.fail("%s\n%s" % (e, e.headers)) def test_introspection2(self): - p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) - divhelp = p.system.methodHelp('div') - self.assertEqual(divhelp, 'This is the div function') + try: + p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) + divhelp = p.system.methodHelp('div') + self.assertEqual(divhelp, 'This is the div function') + except xmlrpclib.ProtocolError, e: + # protocol error; provide additional information in test output + self.fail("%s\n%s" % (e, e.headers)) def test_introspection3(self): # the SimpleXMLRPCServer doesn't support signatures, but # at least check that we can try - p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) - divsig = p.system.methodSignature('div') - self.assertEqual(divsig, 'signatures not supported') + try: + p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) + divsig = p.system.methodSignature('div') + self.assertEqual(divsig, 'signatures not supported') + except xmlrpclib.ProtocolError, e: + # protocol error; provide additional information in test output + self.fail("%s\n%s" % (e, e.headers)) def test_multicall(self): - p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) - multicall = xmlrpclib.MultiCall(p) - multicall.add(2,3) - multicall.pow(6,8) - multicall.div(127,42) - add_result, pow_result, div_result = multicall() - self.assertEqual(add_result, 2+3) - self.assertEqual(pow_result, 6**8) - self.assertEqual(div_result, 127//42) + try: + p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) + multicall = xmlrpclib.MultiCall(p) + multicall.add(2,3) + multicall.pow(6,8) + multicall.div(127,42) + add_result, pow_result, div_result = multicall() + self.assertEqual(add_result, 2+3) + self.assertEqual(pow_result, 6**8) + self.assertEqual(div_result, 127//42) + except xmlrpclib.ProtocolError, e: + # protocol error; provide additional information in test output + self.fail("%s\n%s" % (e, e.headers)) # This is a contrived way to make a failure occur on the server side @@ -375,9 +395,16 @@ class FailingServerTestCase(unittest.TestCase): flagval = SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header self.assertEqual(flagval, False) - # test a call that won't fail just as a smoke test - p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) - self.assertEqual(p.pow(6,8), 6**8) + # enable traceback reporting + SimpleXMLRPCServer.SimpleXMLRPCServer._send_traceback_header = True + + # test a call that shouldn't fail just as a smoke test + try: + p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) + self.assertEqual(p.pow(6,8), 6**8) + except xmlrpclib.ProtocolError, e: + # protocol error; provide additional information in test output + self.fail("%s\n%s" % (e, e.headers)) def test_fail_no_info(self): # use the broken message class diff --git a/Python/compile.c b/Python/compile.c index 77c6a77..8ae4036 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -914,7 +914,20 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o) Py_ssize_t arg; /* necessary to make sure types aren't coerced (e.g., int and long) */ - t = PyTuple_Pack(2, o, o->ob_type); + /* _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms */ + if (PyFloat_Check(o)) { + double d = PyFloat_AS_DOUBLE(o); + unsigned char* p = (unsigned char*) &d; + /* all we need is to make the tuple different in either the 0.0 + * or -0.0 case from all others, just to avoid the "coercion". + */ + if (*p==0 && p[sizeof(double)-1]==0) + t = PyTuple_Pack(3, o, o->ob_type, Py_None); + else + t = PyTuple_Pack(2, o, o->ob_type); + } else { + t = PyTuple_Pack(2, o, o->ob_type); + } if (t == NULL) return -1; diff --git a/Python/import.c b/Python/import.c index 49a47bb..72138c2 100644 --- a/Python/import.c +++ b/Python/import.c @@ -118,15 +118,19 @@ _PyImport_Init(void) /* prepare _PyImport_Filetab: copy entries from _PyImport_DynLoadFiletab and _PyImport_StandardFiletab. */ +#ifdef HAVE_DYNAMIC_LOADING for (scan = _PyImport_DynLoadFiletab; scan->suffix != NULL; ++scan) ++countD; +#endif for (scan = _PyImport_StandardFiletab; scan->suffix != NULL; ++scan) ++countS; filetab = PyMem_NEW(struct filedescr, countD + countS + 1); if (filetab == NULL) Py_FatalError("Can't initialize import file table."); +#ifdef HAVE_DYNAMIC_LOADING memcpy(filetab, _PyImport_DynLoadFiletab, countD * sizeof(struct filedescr)); +#endif memcpy(filetab + countD, _PyImport_StandardFiletab, countS * sizeof(struct filedescr)); filetab[countD + countS].suffix = NULL; @@ -1321,7 +1325,7 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf, saved_namelen = namelen; #endif /* PYOS_OS2 */ for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) { -#if defined(PYOS_OS2) +#if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING) /* OS/2 limits DLLs to 8 character names (w/o extension) * so if the name is longer than that and its a diff --git a/setup.py b/setup.py index 3d527fd..00245b5 100644 --- a/setup.py +++ b/setup.py @@ -194,18 +194,21 @@ class PyBuildExt(build_ext): for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]): print("%-*s %-*s %-*s" % (longest, e, longest, f, longest, g)) - print() if missing: print() print("Failed to find the necessary bits to build these modules:") print_three_column(missing) + print("To find the necessary bits, look in setup.py in" + " detect_modules() for the module's name.") + print() if self.failed: failed = self.failed[:] print() print("Failed to build these modules:") print_three_column(failed) + print() def build_extension(self, ext): @@ -299,7 +302,8 @@ class PyBuildExt(build_ext): # strip out double-dashes first so that we don't end up with # substituting "--Long" to "-Long" and thus lead to "ong" being # used for a library directory. - env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1], '', env_val) + env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1], + ' ', env_val) parser = optparse.OptionParser() # Make sure that allowing args interspersed with options is # allowed -- cgit v0.12