Mailman 3 October 2012 - Python-checkins

peps: Revert PEP 430 to Final.
by nick.coghlan Nov. 3, 2012

Nov. 3, 2012

http://hg.python.org/peps/rev/1ccf682bdfc9 changeset: 4575:1ccf682bdfc9 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sun Oct 28 22:06:46 2012 +1000 summary: Revert PEP 430 to Final. I realised the way Georg had already implemented this made more sense, so I just updated the PEP to reflect the new setup on docs.python.org files: pep-0430.txt | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pep-0430.txt b/pep-0430.txt --- a/pep-0430.txt +++ b/pep-0430.txt @@ -4,7 +4,7 @@ Last-Modified: $Date$ Author: Nick Coghlan <ncoghlan(a)gmail.com> BDFL-Delegate: Georg Brandl -Status: Draft +Status: Final Type: Informational Content-Type: text/x-rst Created: 27-Oct-2012 @@ -118,10 +118,6 @@ The existing ``/py3k/`` subpath will be redirected to the new ``/3/`` subpath. -To help ensure future stability even of links to the in-development version, -the ``/dev/`` subpath will be redirected to the appropriate version specific -subpath (currently ``/3.4/``). - Presented URLs -------------- @@ -131,6 +127,7 @@ * ``http://docs.python.org/x/*`` * ``http://docs.python.org/x.y/*`` +* ``http://docs.python.org/dev/*`` * ``http://docs.python.org/release/x.y.z/*`` * ``http://docs.python.org/devguide`` @@ -144,7 +141,7 @@ The ``/x.y/`` URLs mean "give me the latest documentation for this release". It will draw the documentation from the relevant maintenance branch in source control (or the default branch for the currently in development -version. It differs from the status quo in that the URLs will +version). It differs from the status quo in that the URLs will actually remain available in the user's browser for easy copy and pasting. (Currently, references to specific versions that are not the latest in their release series will resolve to a stable URL for a specific maintenance @@ -153,6 +150,9 @@ a "latest version specific URL", since it is always necessary to construct them manually). +The ``/dev/`` URL means the documentation for the default branch in source +control. + The ``/release/x.y.x/`` URLs will refer to the documentation of those releases, exactly as it was at the time of the release. @@ -186,6 +186,17 @@ Namespaces are one honking great idea - let's do more of those. +Note that the approach described in this PEP gives two ways to access the +content of the default branch: as ``/dev/`` or using the appropriate +``/x.y/`` reference. This is deliberate, as the default branch is referenced +for two different purposes: + +* to provide additional information when discussing an upcoming feature of + the next release (a ``/x.y/`` URL is appropriate) +* to provide a stable destination for developers to access the documentation + of the next feature release, regardless of the version (a ``/dev/`` URL is + appropriate) + Implementation ============== -- Repository URL: http://hg.python.org/peps

3 3

cpython: Closes #16366: Improve diagnostics from handleError(). Thanks to Antoine Pitrou
by vinay.sajip Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/d7b868cdd9bb changeset: 80146:d7b868cdd9bb user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Wed Oct 31 23:49:19 2012 +0000 summary: Closes #16366: Improve diagnostics from handleError(). Thanks to Antoine Pitrou for the suggestion. files: Lib/logging/__init__.py | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -879,16 +879,27 @@ The record which was being processed is passed in to this method. """ if raiseExceptions and sys.stderr: # see issue 13807 - ei = sys.exc_info() + t, v, tb = sys.exc_info() try: - traceback.print_exception(ei[0], ei[1], ei[2], - None, sys.stderr) - sys.stderr.write('Logged from file %s, line %s\n' % ( - record.filename, record.lineno)) + sys.stderr.write('--- Logging error ---\n') + traceback.print_exception(t, v, tb, None, sys.stderr) + sys.stderr.write('Call stack:\n') + # Walk the stack frame up until we're out of logging, + # so as to print the calling context. + frame = tb.tb_frame + while (frame and os.path.dirname(frame.f_code.co_filename) == + __path__[0]): + frame = frame.f_back + if frame: + traceback.print_stack(frame, file=sys.stderr) + else: + # couldn't find the right stack frame, for some reason + sys.stderr.write('Logged from file %s, line %s\n' % ( + record.filename, record.lineno)) except IOError: #pragma: no cover pass # see issue 5971 finally: - del ei + del t, v, tb class StreamHandler(Handler): """ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): merge 3.3
by benjamin.peterson Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/4ca6f43b12ef changeset: 80145:4ca6f43b12ef parent: 80144:e3eb94389e95 parent: 80143:3c249adc78aa user: Benjamin Peterson <benjamin(a)python.org> date: Wed Oct 31 19:02:30 2012 -0400 summary: merge 3.3 files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): merge heads
by benjamin.peterson Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/e3eb94389e95 changeset: 80144:e3eb94389e95 parent: 80142:9c2df50b4fe0 parent: 80140:b3434c1ae503 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Oct 31 19:02:24 2012 -0400 summary: merge heads files: Doc/library/decimal.rst | 21 +- Doc/library/profile.rst | 231 ++++++++++++---------- Lib/test/support.py | 2 +- Lib/test/test_bisect.py | 2 +- Lib/test/test_genericpath.py | 12 +- Lib/test/test_os.py | 83 ++++--- Modules/posixmodule.c | 99 ++------- 7 files changed, 224 insertions(+), 226 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -750,12 +750,21 @@ .. method:: remainder_near(other[, context]) - Compute the modulo as either a positive or negative value depending on - which is closest to zero. For instance, ``Decimal(10).remainder_near(6)`` - returns ``Decimal('-2')`` which is closer to zero than ``Decimal('4')``. - - If both are equally close, the one chosen will have the same sign as - *self*. + Return the remainder from dividing *self* by *other*. This differs from + ``self % other`` in that the sign of the remainder is chosen so as to + minimize its absolute value. More precisely, the return value is + ``self - n * other`` where ``n`` is the integer nearest to the exact + value of ``self / other``, and if two integers are equally near then the + even one is chosen. + + If the result is zero then its sign will be the sign of *self*. + + >>> Decimal(18).remainder_near(Decimal(10)) + Decimal('-2') + >>> Decimal(25).remainder_near(Decimal(10)) + Decimal('5') + >>> Decimal(35).remainder_near(Decimal(10)) + Decimal('-5') .. method:: rotate(other[, context]) diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -240,11 +240,12 @@ 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) ... - The first line indicates that 2706 calls were monitored. Of those calls, 2004 - were :dfn:`primitive`. We define :dfn:`primitive` to mean that the call was not - induced via recursion. The next line: ``Ordered by: standard name``, indicates - that the text string in the far right column was used to sort the output. The - column headings include: + The first line indicates that 2706 calls were monitored. Of those + calls, 2004 were :dfn:`primitive`. We define :dfn:`primitive` to + mean that the call was not induced via recursion. The next line: + ``Ordered by: standard name``, indicates that the text string in + the far right column was used to sort the output. The column + headings include: ncalls for the number of calls, @@ -266,14 +267,14 @@ filename:lineno(function) provides the respective data of each function - When there are two numbers in the first column (for example, ``43/3``), then the - latter is the number of primitive calls, and the former is the actual number of - calls. Note that when the function does not recurse, these two values are the - same, and only the single figure is printed. + When there are two numbers in the first column (for example, + ``43/3``), then the latter is the number of primitive calls, and + the former is the actual number of calls. Note that when the + function does not recurse, these two values are the same, and only + the single figure is printed. - If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno), - ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or - ``'cumulative'`` (sort by cumulative time). The default is ``'stdname'``. + If *sort* is given, it can be one of values allowed for *key* + parameter from :meth:`pstats.Stats.sort_stats`. .. function:: runctx(command, globals, locals, filename=None) @@ -291,19 +292,22 @@ .. class:: Stats(*filenames, stream=sys.stdout) - This class constructor creates an instance of a "statistics object" from a - *filename* (or set of filenames). :class:`Stats` objects are manipulated by - methods, in order to print useful reports. You may specify an alternate output - stream by giving the keyword argument, ``stream``. + This class constructor creates an instance of a "statistics object" + from a *filename* (or set of filenames). :class:`Stats` objects + are manipulated by methods, in order to print useful reports. You + may specify an alternate output stream by giving the keyword + argument, ``stream``. - The file selected by the above constructor must have been created by the - corresponding version of :mod:`profile` or :mod:`cProfile`. To be specific, - there is *no* file compatibility guaranteed with future versions of this - profiler, and there is no compatibility with files produced by other profilers. - If several files are provided, all the statistics for identical functions will - be coalesced, so that an overall view of several processes can be considered in - a single report. If additional files need to be combined with data in an - existing :class:`Stats` object, the :meth:`add` method can be used. + The file selected by the above constructor must have been created + by the corresponding version of :mod:`profile` or :mod:`cProfile`. + To be specific, there is *no* file compatibility guaranteed with + future versions of this profiler, and there is no compatibility + with files produced by other profilers. If several files are + provided, all the statistics for identical functions will be + coalesced, so that an overall view of several processes can be + considered in a single report. If additional files need to be + combined with data in an existing :class:`Stats` object, the + :meth:`add` method can be used. .. (such as the old system profiler). @@ -318,15 +322,17 @@ .. method:: Stats.strip_dirs() - This method for the :class:`Stats` class removes all leading path information - from file names. It is very useful in reducing the size of the printout to fit - within (close to) 80 columns. This method modifies the object, and the stripped - information is lost. After performing a strip operation, the object is - considered to have its entries in a "random" order, as it was just after object - initialization and loading. If :meth:`strip_dirs` causes two function names to - be indistinguishable (they are on the same line of the same filename, and have - the same function name), then the statistics for these two entries are - accumulated into a single entry. + This method for the :class:`Stats` class removes all leading path + information from file names. It is very useful in reducing the + size of the printout to fit within (close to) 80 columns. This + method modifies the object, and the stripped information is lost. + After performing a strip operation, the object is considered to + have its entries in a "random" order, as it was just after object + initialization and loading. If :meth:`strip_dirs` causes two + function names to be indistinguishable (they are on the same line + of the same filename, and have the same function name), then the + statistics for these two entries are accumulated into a single + entry. .. method:: Stats.add(*filenames) @@ -340,23 +346,25 @@ .. method:: Stats.dump_stats(filename) - Save the data loaded into the :class:`Stats` object to a file named *filename*. - The file is created if it does not exist, and is overwritten if it already - exists. This is equivalent to the method of the same name on the - :class:`profile.Profile` and :class:`cProfile.Profile` classes. + Save the data loaded into the :class:`Stats` object to a file named + *filename*. The file is created if it does not exist, and is + overwritten if it already exists. This is equivalent to the method + of the same name on the :class:`profile.Profile` and + :class:`cProfile.Profile` classes. .. method:: Stats.sort_stats(*keys) - This method modifies the :class:`Stats` object by sorting it according to the - supplied criteria. The argument is typically a string identifying the basis of - a sort (example: ``'time'`` or ``'name'``). + This method modifies the :class:`Stats` object by sorting it + according to the supplied criteria. The argument is typically a + string identifying the basis of a sort (example: ``'time'`` or + ``'name'``). - When more than one key is provided, then additional keys are used as secondary - criteria when there is equality in all keys selected before them. For example, - ``sort_stats('name', 'file')`` will sort all the entries according to their - function name, and resolve all ties (identical function names) by sorting by - file name. + When more than one key is provided, then additional keys are used + as secondary criteria when there is equality in all keys selected + before them. For example, ``sort_stats('name', 'file')`` will sort + all the entries according to their function name, and resolve all + ties (identical function names) by sorting by file name. Abbreviations can be used for any key names, as long as the abbreviation is unambiguous. The following are the keys currently defined: @@ -368,10 +376,16 @@ +------------------+----------------------+ | ``'cumulative'`` | cumulative time | +------------------+----------------------+ + | ``'cumtime'`` | cumulative time | + +------------------+----------------------+ | ``'file'`` | file name | +------------------+----------------------+ + | ``'filename'`` | file name | + +------------------+----------------------+ | ``'module'`` | file name | +------------------+----------------------+ + | ``'ncalls'`` | call count | + +------------------+----------------------+ | ``'pcalls'`` | primitive call count | +------------------+----------------------+ | ``'line'`` | line number | @@ -384,51 +398,60 @@ +------------------+----------------------+ | ``'time'`` | internal time | +------------------+----------------------+ + | ``'tottime'`` | internal time | + +------------------+----------------------+ - Note that all sorts on statistics are in descending order (placing most time - consuming items first), where as name, file, and line number searches are in - ascending order (alphabetical). The subtle distinction between ``'nfl'`` and - ``'stdname'`` is that the standard name is a sort of the name as printed, which - means that the embedded line numbers get compared in an odd way. For example, - lines 3, 20, and 40 would (if the file names were the same) appear in the string - order 20, 3 and 40. In contrast, ``'nfl'`` does a numeric compare of the line - numbers. In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name', - 'file', 'line')``. + Note that all sorts on statistics are in descending order (placing + most time consuming items first), where as name, file, and line + number searches are in ascending order (alphabetical). The subtle + distinction between ``'nfl'`` and ``'stdname'`` is that the + standard name is a sort of the name as printed, which means that + the embedded line numbers get compared in an odd way. For example, + lines 3, 20, and 40 would (if the file names were the same) appear + in the string order 20, 3 and 40. In contrast, ``'nfl'`` does a + numeric compare of the line numbers. In fact, + ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file', + 'line')``. - For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``, - and ``2`` are permitted. They are interpreted as ``'stdname'``, ``'calls'``, - ``'time'``, and ``'cumulative'`` respectively. If this old style format - (numeric) is used, only one sort key (the numeric key) will be used, and - additional arguments will be silently ignored. + For backward-compatibility reasons, the numeric arguments ``-1``, + ``0``, ``1``, and ``2`` are permitted. They are interpreted as + ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'`` + respectively. If this old style format (numeric) is used, only one + sort key (the numeric key) will be used, and additional arguments + will be silently ignored. .. For compatibility with the old profiler, .. method:: Stats.reverse_order() - This method for the :class:`Stats` class reverses the ordering of the basic list - within the object. Note that by default ascending vs descending order is - properly selected based on the sort key of choice. + This method for the :class:`Stats` class reverses the ordering of + the basic list within the object. Note that by default ascending + vs descending order is properly selected based on the sort key of + choice. .. This method is provided primarily for compatibility with the old profiler. .. method:: Stats.print_stats(*restrictions) - This method for the :class:`Stats` class prints out a report as described in the - :func:`profile.run` definition. + This method for the :class:`Stats` class prints out a report as + described in the :func:`profile.run` definition. - The order of the printing is based on the last :meth:`sort_stats` operation done - on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`). + The order of the printing is based on the last :meth:`sort_stats` + operation done on the object (subject to caveats in :meth:`add` and + :meth:`strip_dirs`). - The arguments provided (if any) can be used to limit the list down to the - significant entries. Initially, the list is taken to be the complete set of - profiled functions. Each restriction is either an integer (to select a count of - lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a - percentage of lines), or a regular expression (to pattern match the standard - name that is printed; as of Python 1.5b1, this uses the Perl-style regular - expression syntax defined by the :mod:`re` module). If several restrictions are - provided, then they are applied sequentially. For example:: + The arguments provided (if any) can be used to limit the list down + to the significant entries. Initially, the list is taken to be the + complete set of profiled functions. Each restriction is either an + integer (to select a count of lines), or a decimal fraction between + 0.0 and 1.0 inclusive (to select a percentage of lines), or a + regular expression (to pattern match the standard name that is + printed; as of Python 1.5b1, this uses the Perl-style regular + expression syntax defined by the :mod:`re` module). If several + restrictions are provided, then they are applied sequentially. For + example:: print_stats(.1, 'foo:') @@ -455,17 +478,19 @@ non-parenthesized number repeats the cumulative time spent in the function at the right. - * With :mod:`cProfile`, each caller is preceded by three numbers: the number of - times this specific call was made, and the total and cumulative times spent in - the current function while it was invoked by this specific caller. + * With :mod:`cProfile`, each caller is preceded by three numbers: + the number of times this specific call was made, and the total + and cumulative times spent in the current function while it was + invoked by this specific caller. .. method:: Stats.print_callees(*restrictions) - This method for the :class:`Stats` class prints a list of all function that were - called by the indicated function. Aside from this reversal of direction of - calls (re: called vs was called by), the arguments and ordering are identical to - the :meth:`print_callers` method. + This method for the :class:`Stats` class prints a list of all + function that were called by the indicated function. Aside from + this reversal of direction of calls (re: called vs was called by), + the arguments and ordering are identical to the + :meth:`print_callers` method. .. _profile-limits: @@ -566,29 +591,33 @@ The resulting profiler will then call :func:`your_time_func`. :class:`profile.Profile` - :func:`your_time_func` should return a single number, or a list of numbers whose - sum is the current time (like what :func:`os.times` returns). If the function - returns a single time number, or the list of returned numbers has length 2, then - you will get an especially fast version of the dispatch routine. + :func:`your_time_func` should return a single number, or a list of + numbers whose sum is the current time (like what :func:`os.times` + returns). If the function returns a single time number, or the + list of returned numbers has length 2, then you will get an + especially fast version of the dispatch routine. - Be warned that you should calibrate the profiler class for the timer function - that you choose. For most machines, a timer that returns a lone integer value - will provide the best results in terms of low overhead during profiling. - (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point - values). If you want to substitute a better timer in the cleanest fashion, - derive a class and hardwire a replacement dispatch method that best handles your - timer call, along with the appropriate calibration constant. + Be warned that you should calibrate the profiler class for the + timer function that you choose. For most machines, a timer that + returns a lone integer value will provide the best results in terms + of low overhead during profiling. (:func:`os.times` is *pretty* + bad, as it returns a tuple of floating point values). If you want + to substitute a better timer in the cleanest fashion, derive a + class and hardwire a replacement dispatch method that best handles + your timer call, along with the appropriate calibration constant. :class:`cProfile.Profile` - :func:`your_time_func` should return a single number. If it returns - integers, you can also invoke the class constructor with a second argument - specifying the real duration of one unit of time. For example, if - :func:`your_integer_time_func` returns times measured in thousands of seconds, - you would construct the :class:`Profile` instance as follows:: + :func:`your_time_func` should return a single number. If it + returns integers, you can also invoke the class constructor with a + second argument specifying the real duration of one unit of time. + For example, if :func:`your_integer_time_func` returns times + measured in thousands of seconds, you would construct the + :class:`Profile` instance as follows:: pr = profile.Profile(your_integer_time_func, 0.001) - As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer - functions should be used with care and should be as fast as possible. For the - best results with a custom timer, it might be necessary to hard-code it in the C - source of the internal :mod:`_lsprof` module. + As the :mod:`cProfile.Profile` class cannot be calibrated, custom + timer functions should be used with care and should be as fast as + possible. For the best results with a custom timer, it might be + necessary to hard-code it in the C source of the internal + :mod:`_lsprof` module. diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -654,7 +654,7 @@ for name in (b'abc\xff', b'\xe7w\xf0'): try: os.fsdecode(name) - except UnicodeDecodeErorr: + except UnicodeDecodeError: TESTFN_UNDECODABLE = name break diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py --- a/Lib/test/test_bisect.py +++ b/Lib/test/test_bisect.py @@ -239,7 +239,7 @@ else: f = self.module.insort_right f(insorted, digit) - self.assertEqual(sorted(insorted), insorted) + self.assertEqual(sorted(insorted), insorted) def test_backcompatibility(self): self.assertEqual(self.module.insort, self.module.insort_right) diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py --- a/Lib/test/test_genericpath.py +++ b/Lib/test/test_genericpath.py @@ -311,14 +311,10 @@ @unittest.skipIf(sys.platform == 'darwin', "Mac OS X denies the creation of a directory with an invalid utf8 name") def test_nonascii_abspath(self): - name = b'\xe7w\xf0' - if sys.platform == 'win32': - try: - os.fsdecode(name) - except UnicodeDecodeError: - self.skipTest("the filename %a is not decodable " - "from the ANSI code page %s" - % (name, sys.getfilesystemencoding())) + if support.TESTFN_UNDECODABLE: + name = support.TESTFN_UNDECODABLE + else: + name = b'a\xffb\xe7w\xf0' # Test non-ASCII, non-UTF8 bytes in the path. with warnings.catch_warnings(): diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2051,65 +2051,82 @@ class Str(str): pass - self.filenames = [] + self.bytes_filenames = [] + self.unicode_filenames = [] if support.TESTFN_UNENCODABLE is not None: decoded = support.TESTFN_UNENCODABLE else: decoded = support.TESTFN - self.filenames.append(decoded) - self.filenames.append(Str(decoded)) + self.unicode_filenames.append(decoded) + self.unicode_filenames.append(Str(decoded)) if support.TESTFN_UNDECODABLE is not None: encoded = support.TESTFN_UNDECODABLE else: encoded = os.fsencode(support.TESTFN) - self.filenames.append(encoded) - self.filenames.append(memoryview(encoded)) + self.bytes_filenames.append(encoded) + self.bytes_filenames.append(memoryview(encoded)) + + self.filenames = self.bytes_filenames + self.unicode_filenames def test_oserror_filename(self): funcs = [ - (os.chdir,), - (os.chmod, 0o777), - (os.lchown, 0, 0), - (os.listdir,), - (os.lstat,), - (os.open, os.O_RDONLY), - (os.rename, "dst"), - (os.replace, "dst"), - (os.rmdir,), - (os.stat,), - (os.truncate, 0), - (os.unlink,), + (self.filenames, os.chdir,), + (self.filenames, os.chmod, 0o777), + (self.filenames, os.listdir,), + (self.filenames, os.lstat,), + (self.filenames, os.open, os.O_RDONLY), + (self.filenames, os.rmdir,), + (self.filenames, os.stat,), + (self.filenames, os.unlink,), ] - if hasattr(os, "chown"): - funcs.append((os.chown, 0, 0)) if sys.platform == "win32": funcs.extend(( - (os._getfullpathname,), - (os._isdir,), + (self.bytes_filenames, os.rename, b"dst"), + (self.bytes_filenames, os.replace, b"dst"), + (self.unicode_filenames, os.rename, "dst"), + (self.unicode_filenames, os.replace, "dst"), )) + else: + funcs.extend(( + (self.filenames, os.rename, "dst"), + (self.filenames, os.replace, "dst"), + )) + if hasattr(os, "chown"): + funcs.append((self.filenames, os.chown, 0, 0)) + if hasattr(os, "lchown"): + funcs.append((self.filenames, os.lchown, 0, 0)) + if hasattr(os, "truncate"): + funcs.append((self.filenames, os.truncate, 0)) if hasattr(os, "chflags"): funcs.extend(( - (os.chflags, 0), - (os.lchflags, 0), + (self.filenames, os.chflags, 0), + (self.filenames, os.lchflags, 0), )) if hasattr(os, "chroot"): - funcs.append((os.chroot,)) + funcs.append((self.filenames, os.chroot,)) if hasattr(os, "link"): - funcs.append((os.link, "dst")) + if sys.platform == "win32": + funcs.append((self.bytes_filenames, os.link, b"dst")) + funcs.append((self.unicode_filenames, os.link, "dst")) + else: + funcs.append((self.filenames, os.link, "dst")) if hasattr(os, "listxattr"): funcs.extend(( - (os.listxattr,), - (os.getxattr, "user.test"), - (os.setxattr, "user.test", b'user'), - (os.removexattr, "user.test"), + (self.filenames, os.listxattr,), + (self.filenames, os.getxattr, "user.test"), + (self.filenames, os.setxattr, "user.test", b'user'), + (self.filenames, os.removexattr, "user.test"), )) if hasattr(os, "lchmod"): - funcs.append((os.lchmod, 0o777)) + funcs.append((self.filenames, os.lchmod, 0o777)) if hasattr(os, "readlink"): - funcs.append((os.readlink,)) + if sys.platform == "win32": + funcs.append((self.unicode_filenames, os.readlink,)) + else: + funcs.append((self.filenames, os.readlink,)) - for func, *func_args in funcs: - for name in self.filenames: + for filenames, func, *func_args in funcs: + for name in filenames: try: func(name, *func_args) except OSError as err: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1035,17 +1035,6 @@ } static PyObject * -win32_error_unicode(char* function, wchar_t* filename) -{ - /* XXX - see win32_error for comments on 'function' */ - errno = GetLastError(); - if (filename) - return PyErr_SetFromWindowsErrWithUnicodeFilename(errno, filename); - else - return PyErr_SetFromWindowsErr(errno); -} - -static PyObject * win32_error_object(char* function, PyObject* filename) { /* XXX - see win32_error for comments on 'function' */ @@ -1119,44 +1108,6 @@ #ifdef MS_WINDOWS -static PyObject* -win32_1str(PyObject* args, char* func, - char* format, BOOL (__stdcall *funcA)(LPCSTR), - char* wformat, BOOL (__stdcall *funcW)(LPWSTR)) -{ - PyObject *uni; - const char *ansi; - BOOL result; - - if (PyArg_ParseTuple(args, wformat, &uni)) - { - wchar_t *wstr = PyUnicode_AsUnicode(uni); - if (wstr == NULL) - return NULL; - Py_BEGIN_ALLOW_THREADS - result = funcW(wstr); - Py_END_ALLOW_THREADS - if (!result) - return win32_error_object(func, uni); - Py_INCREF(Py_None); - return Py_None; - } - PyErr_Clear(); - - if (!PyArg_ParseTuple(args, format, &ansi)) - return NULL; - if (win32_warn_bytes_api()) - return NULL; - Py_BEGIN_ALLOW_THREADS - result = funcA(ansi); - Py_END_ALLOW_THREADS - if (!result) - return win32_error(func, ansi); - Py_INCREF(Py_None); - return Py_None; - -} - /* This is a reimplementation of the C library's chdir function, but one that produces Win32 errors instead of DOS error codes. chdir is essentially a wrapper around SetCurrentDirectory; however, @@ -2533,7 +2484,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object("chmod", path.object); + return_value = path_error(&path); goto exit; } #else /* MS_WINDOWS */ @@ -2989,11 +2940,13 @@ return NULL; } if (!len) { - if (wbuf2 != wbuf) free(wbuf2); - return win32_error("getcwdu", NULL); + if (wbuf2 != wbuf) + free(wbuf2); + return PyErr_SetFromWindowsErr(0); } resobj = PyUnicode_FromWideChar(wbuf2, len); - if (wbuf2 != wbuf) free(wbuf2); + if (wbuf2 != wbuf) + free(wbuf2); return resobj; } @@ -3101,7 +3054,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object("link", dst.object); + return_value = path_error(&src); goto exit; } #else @@ -3225,8 +3178,7 @@ if (error == ERROR_FILE_NOT_FOUND) goto exit; Py_DECREF(list); - list = NULL; - win32_error_unicode("FindFirstFileW", wnamebuf); + list = path_error(&path); goto exit; } do { @@ -3255,7 +3207,7 @@ it got to the end of the directory. */ if (!result && GetLastError() != ERROR_NO_MORE_FILES) { Py_DECREF(list); - list = win32_error_unicode("FindNextFileW", wnamebuf); + list = path_error(&path); goto exit; } } while (result == TRUE); @@ -3282,7 +3234,7 @@ if (error == ERROR_FILE_NOT_FOUND) goto exit; Py_DECREF(list); - list = win32_error("FindFirstFile", namebuf); + list = path_error(&path); goto exit; } do { @@ -3310,7 +3262,7 @@ it got to the end of the directory. */ if (!result && GetLastError() != ERROR_NO_MORE_FILES) { Py_DECREF(list); - list = win32_error("FindNextFile", namebuf); + list = path_error(&path); goto exit; } } while (result == TRUE); @@ -3320,7 +3272,7 @@ if (FindClose(hFindFile) == FALSE) { if (list != NULL) { Py_DECREF(list); - list = win32_error_object("FindClose", path.object); + list = path_error(&path); } } } @@ -3569,7 +3521,7 @@ return posix_error(); if (!GetFileInformationByHandle(hFile, &info)) - return win32_error("_getfileinformation", NULL); + return PyErr_SetFromWindowsErr(0); return Py_BuildValue("iii", info.dwVolumeSerialNumber, info.nFileIndexHigh, @@ -3658,7 +3610,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object("mkdir", path.object); + return_value = path_error(&path); goto exit; } #else @@ -3828,7 +3780,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object(function_name, dst.object); + return_value = path_error(&src); goto exit; } @@ -4396,6 +4348,7 @@ PyObject *return_value = NULL; memset(&path, 0, sizeof(path)); + path.function_name = "utime"; #if UTIME_HAVE_FD path.allow_fd = 1; #endif @@ -4484,7 +4437,7 @@ FILE_FLAG_BACKUP_SEMANTICS, NULL); Py_END_ALLOW_THREADS if (hFile == INVALID_HANDLE_VALUE) { - win32_error_object("utime", path.object); + path_error(&path); goto exit; } @@ -4493,7 +4446,7 @@ GetSystemTime(&now); if (!SystemTimeToFileTime(&now, &mtime) || !SystemTimeToFileTime(&now, &atime)) { - win32_error("utime", NULL); + PyErr_SetFromWindowsErr(0); goto exit; } } @@ -4506,7 +4459,7 @@ as that may confuse the user into believing that something is wrong with the file, when it also could be the time stamp that gives a problem. */ - win32_error("utime", NULL); + PyErr_SetFromWindowsErr(0); goto exit; } #else /* MS_WINDOWS */ @@ -6736,7 +6689,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = win32_error_object("symlink", src.object); + return_value = path_error(&src); goto exit; } @@ -6752,7 +6705,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error(&dst); + return_value = path_error(&src); goto exit; } #endif @@ -7104,12 +7057,6 @@ Py_END_ALLOW_THREADS if (fd == -1) { -#ifdef MS_WINDOWS - /* force use of posix_error here for exact backwards compatibility */ - if (path.wide) - return_value = posix_error(); - else -#endif return_value = path_error(&path); goto exit; } @@ -7648,7 +7595,7 @@ Py_END_ALLOW_THREADS if (res != 0) { #ifdef MS_WINDOWS - return win32_error("fstat", NULL); + return PyErr_SetFromWindowsErr(0); #else return posix_error(); #endif @@ -7694,7 +7641,7 @@ BOOL ok; ok = CreatePipe(&read, &write, NULL, 0); if (!ok) - return win32_error("CreatePipe", NULL); + return PyErr_SetFromWindowsErr(0); read_fd = _open_osfhandle((Py_intptr_t)read, 0); write_fd = _open_osfhandle((Py_intptr_t)write, 1); return Py_BuildValue("(ii)", read_fd, write_fd); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> 3.3): merge heads
by benjamin.peterson Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/3c249adc78aa changeset: 80143:3c249adc78aa branch: 3.3 parent: 80141:6964a9b6c1ea parent: 80134:f3dd84feeb58 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Oct 31 19:02:18 2012 -0400 summary: merge heads files: Doc/library/decimal.rst | 21 +- Doc/library/profile.rst | 231 +++++++++++++++------------ Lib/test/test_bisect.py | 2 +- 3 files changed, 146 insertions(+), 108 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -750,12 +750,21 @@ .. method:: remainder_near(other[, context]) - Compute the modulo as either a positive or negative value depending on - which is closest to zero. For instance, ``Decimal(10).remainder_near(6)`` - returns ``Decimal('-2')`` which is closer to zero than ``Decimal('4')``. - - If both are equally close, the one chosen will have the same sign as - *self*. + Return the remainder from dividing *self* by *other*. This differs from + ``self % other`` in that the sign of the remainder is chosen so as to + minimize its absolute value. More precisely, the return value is + ``self - n * other`` where ``n`` is the integer nearest to the exact + value of ``self / other``, and if two integers are equally near then the + even one is chosen. + + If the result is zero then its sign will be the sign of *self*. + + >>> Decimal(18).remainder_near(Decimal(10)) + Decimal('-2') + >>> Decimal(25).remainder_near(Decimal(10)) + Decimal('5') + >>> Decimal(35).remainder_near(Decimal(10)) + Decimal('-5') .. method:: rotate(other[, context]) diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -240,11 +240,12 @@ 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) ... - The first line indicates that 2706 calls were monitored. Of those calls, 2004 - were :dfn:`primitive`. We define :dfn:`primitive` to mean that the call was not - induced via recursion. The next line: ``Ordered by: standard name``, indicates - that the text string in the far right column was used to sort the output. The - column headings include: + The first line indicates that 2706 calls were monitored. Of those + calls, 2004 were :dfn:`primitive`. We define :dfn:`primitive` to + mean that the call was not induced via recursion. The next line: + ``Ordered by: standard name``, indicates that the text string in + the far right column was used to sort the output. The column + headings include: ncalls for the number of calls, @@ -266,14 +267,14 @@ filename:lineno(function) provides the respective data of each function - When there are two numbers in the first column (for example, ``43/3``), then the - latter is the number of primitive calls, and the former is the actual number of - calls. Note that when the function does not recurse, these two values are the - same, and only the single figure is printed. + When there are two numbers in the first column (for example, + ``43/3``), then the latter is the number of primitive calls, and + the former is the actual number of calls. Note that when the + function does not recurse, these two values are the same, and only + the single figure is printed. - If *sort* is given, it can be one of ``'stdname'`` (sort by filename:lineno), - ``'calls'`` (sort by number of calls), ``'time'`` (sort by total time) or - ``'cumulative'`` (sort by cumulative time). The default is ``'stdname'``. + If *sort* is given, it can be one of values allowed for *key* + parameter from :meth:`pstats.Stats.sort_stats`. .. function:: runctx(command, globals, locals, filename=None) @@ -291,19 +292,22 @@ .. class:: Stats(*filenames, stream=sys.stdout) - This class constructor creates an instance of a "statistics object" from a - *filename* (or set of filenames). :class:`Stats` objects are manipulated by - methods, in order to print useful reports. You may specify an alternate output - stream by giving the keyword argument, ``stream``. + This class constructor creates an instance of a "statistics object" + from a *filename* (or set of filenames). :class:`Stats` objects + are manipulated by methods, in order to print useful reports. You + may specify an alternate output stream by giving the keyword + argument, ``stream``. - The file selected by the above constructor must have been created by the - corresponding version of :mod:`profile` or :mod:`cProfile`. To be specific, - there is *no* file compatibility guaranteed with future versions of this - profiler, and there is no compatibility with files produced by other profilers. - If several files are provided, all the statistics for identical functions will - be coalesced, so that an overall view of several processes can be considered in - a single report. If additional files need to be combined with data in an - existing :class:`Stats` object, the :meth:`add` method can be used. + The file selected by the above constructor must have been created + by the corresponding version of :mod:`profile` or :mod:`cProfile`. + To be specific, there is *no* file compatibility guaranteed with + future versions of this profiler, and there is no compatibility + with files produced by other profilers. If several files are + provided, all the statistics for identical functions will be + coalesced, so that an overall view of several processes can be + considered in a single report. If additional files need to be + combined with data in an existing :class:`Stats` object, the + :meth:`add` method can be used. .. (such as the old system profiler). @@ -318,15 +322,17 @@ .. method:: Stats.strip_dirs() - This method for the :class:`Stats` class removes all leading path information - from file names. It is very useful in reducing the size of the printout to fit - within (close to) 80 columns. This method modifies the object, and the stripped - information is lost. After performing a strip operation, the object is - considered to have its entries in a "random" order, as it was just after object - initialization and loading. If :meth:`strip_dirs` causes two function names to - be indistinguishable (they are on the same line of the same filename, and have - the same function name), then the statistics for these two entries are - accumulated into a single entry. + This method for the :class:`Stats` class removes all leading path + information from file names. It is very useful in reducing the + size of the printout to fit within (close to) 80 columns. This + method modifies the object, and the stripped information is lost. + After performing a strip operation, the object is considered to + have its entries in a "random" order, as it was just after object + initialization and loading. If :meth:`strip_dirs` causes two + function names to be indistinguishable (they are on the same line + of the same filename, and have the same function name), then the + statistics for these two entries are accumulated into a single + entry. .. method:: Stats.add(*filenames) @@ -340,23 +346,25 @@ .. method:: Stats.dump_stats(filename) - Save the data loaded into the :class:`Stats` object to a file named *filename*. - The file is created if it does not exist, and is overwritten if it already - exists. This is equivalent to the method of the same name on the - :class:`profile.Profile` and :class:`cProfile.Profile` classes. + Save the data loaded into the :class:`Stats` object to a file named + *filename*. The file is created if it does not exist, and is + overwritten if it already exists. This is equivalent to the method + of the same name on the :class:`profile.Profile` and + :class:`cProfile.Profile` classes. .. method:: Stats.sort_stats(*keys) - This method modifies the :class:`Stats` object by sorting it according to the - supplied criteria. The argument is typically a string identifying the basis of - a sort (example: ``'time'`` or ``'name'``). + This method modifies the :class:`Stats` object by sorting it + according to the supplied criteria. The argument is typically a + string identifying the basis of a sort (example: ``'time'`` or + ``'name'``). - When more than one key is provided, then additional keys are used as secondary - criteria when there is equality in all keys selected before them. For example, - ``sort_stats('name', 'file')`` will sort all the entries according to their - function name, and resolve all ties (identical function names) by sorting by - file name. + When more than one key is provided, then additional keys are used + as secondary criteria when there is equality in all keys selected + before them. For example, ``sort_stats('name', 'file')`` will sort + all the entries according to their function name, and resolve all + ties (identical function names) by sorting by file name. Abbreviations can be used for any key names, as long as the abbreviation is unambiguous. The following are the keys currently defined: @@ -368,10 +376,16 @@ +------------------+----------------------+ | ``'cumulative'`` | cumulative time | +------------------+----------------------+ + | ``'cumtime'`` | cumulative time | + +------------------+----------------------+ | ``'file'`` | file name | +------------------+----------------------+ + | ``'filename'`` | file name | + +------------------+----------------------+ | ``'module'`` | file name | +------------------+----------------------+ + | ``'ncalls'`` | call count | + +------------------+----------------------+ | ``'pcalls'`` | primitive call count | +------------------+----------------------+ | ``'line'`` | line number | @@ -384,51 +398,60 @@ +------------------+----------------------+ | ``'time'`` | internal time | +------------------+----------------------+ + | ``'tottime'`` | internal time | + +------------------+----------------------+ - Note that all sorts on statistics are in descending order (placing most time - consuming items first), where as name, file, and line number searches are in - ascending order (alphabetical). The subtle distinction between ``'nfl'`` and - ``'stdname'`` is that the standard name is a sort of the name as printed, which - means that the embedded line numbers get compared in an odd way. For example, - lines 3, 20, and 40 would (if the file names were the same) appear in the string - order 20, 3 and 40. In contrast, ``'nfl'`` does a numeric compare of the line - numbers. In fact, ``sort_stats('nfl')`` is the same as ``sort_stats('name', - 'file', 'line')``. + Note that all sorts on statistics are in descending order (placing + most time consuming items first), where as name, file, and line + number searches are in ascending order (alphabetical). The subtle + distinction between ``'nfl'`` and ``'stdname'`` is that the + standard name is a sort of the name as printed, which means that + the embedded line numbers get compared in an odd way. For example, + lines 3, 20, and 40 would (if the file names were the same) appear + in the string order 20, 3 and 40. In contrast, ``'nfl'`` does a + numeric compare of the line numbers. In fact, + ``sort_stats('nfl')`` is the same as ``sort_stats('name', 'file', + 'line')``. - For backward-compatibility reasons, the numeric arguments ``-1``, ``0``, ``1``, - and ``2`` are permitted. They are interpreted as ``'stdname'``, ``'calls'``, - ``'time'``, and ``'cumulative'`` respectively. If this old style format - (numeric) is used, only one sort key (the numeric key) will be used, and - additional arguments will be silently ignored. + For backward-compatibility reasons, the numeric arguments ``-1``, + ``0``, ``1``, and ``2`` are permitted. They are interpreted as + ``'stdname'``, ``'calls'``, ``'time'``, and ``'cumulative'`` + respectively. If this old style format (numeric) is used, only one + sort key (the numeric key) will be used, and additional arguments + will be silently ignored. .. For compatibility with the old profiler, .. method:: Stats.reverse_order() - This method for the :class:`Stats` class reverses the ordering of the basic list - within the object. Note that by default ascending vs descending order is - properly selected based on the sort key of choice. + This method for the :class:`Stats` class reverses the ordering of + the basic list within the object. Note that by default ascending + vs descending order is properly selected based on the sort key of + choice. .. This method is provided primarily for compatibility with the old profiler. .. method:: Stats.print_stats(*restrictions) - This method for the :class:`Stats` class prints out a report as described in the - :func:`profile.run` definition. + This method for the :class:`Stats` class prints out a report as + described in the :func:`profile.run` definition. - The order of the printing is based on the last :meth:`sort_stats` operation done - on the object (subject to caveats in :meth:`add` and :meth:`strip_dirs`). + The order of the printing is based on the last :meth:`sort_stats` + operation done on the object (subject to caveats in :meth:`add` and + :meth:`strip_dirs`). - The arguments provided (if any) can be used to limit the list down to the - significant entries. Initially, the list is taken to be the complete set of - profiled functions. Each restriction is either an integer (to select a count of - lines), or a decimal fraction between 0.0 and 1.0 inclusive (to select a - percentage of lines), or a regular expression (to pattern match the standard - name that is printed; as of Python 1.5b1, this uses the Perl-style regular - expression syntax defined by the :mod:`re` module). If several restrictions are - provided, then they are applied sequentially. For example:: + The arguments provided (if any) can be used to limit the list down + to the significant entries. Initially, the list is taken to be the + complete set of profiled functions. Each restriction is either an + integer (to select a count of lines), or a decimal fraction between + 0.0 and 1.0 inclusive (to select a percentage of lines), or a + regular expression (to pattern match the standard name that is + printed; as of Python 1.5b1, this uses the Perl-style regular + expression syntax defined by the :mod:`re` module). If several + restrictions are provided, then they are applied sequentially. For + example:: print_stats(.1, 'foo:') @@ -455,17 +478,19 @@ non-parenthesized number repeats the cumulative time spent in the function at the right. - * With :mod:`cProfile`, each caller is preceded by three numbers: the number of - times this specific call was made, and the total and cumulative times spent in - the current function while it was invoked by this specific caller. + * With :mod:`cProfile`, each caller is preceded by three numbers: + the number of times this specific call was made, and the total + and cumulative times spent in the current function while it was + invoked by this specific caller. .. method:: Stats.print_callees(*restrictions) - This method for the :class:`Stats` class prints a list of all function that were - called by the indicated function. Aside from this reversal of direction of - calls (re: called vs was called by), the arguments and ordering are identical to - the :meth:`print_callers` method. + This method for the :class:`Stats` class prints a list of all + function that were called by the indicated function. Aside from + this reversal of direction of calls (re: called vs was called by), + the arguments and ordering are identical to the + :meth:`print_callers` method. .. _profile-limits: @@ -566,29 +591,33 @@ The resulting profiler will then call :func:`your_time_func`. :class:`profile.Profile` - :func:`your_time_func` should return a single number, or a list of numbers whose - sum is the current time (like what :func:`os.times` returns). If the function - returns a single time number, or the list of returned numbers has length 2, then - you will get an especially fast version of the dispatch routine. + :func:`your_time_func` should return a single number, or a list of + numbers whose sum is the current time (like what :func:`os.times` + returns). If the function returns a single time number, or the + list of returned numbers has length 2, then you will get an + especially fast version of the dispatch routine. - Be warned that you should calibrate the profiler class for the timer function - that you choose. For most machines, a timer that returns a lone integer value - will provide the best results in terms of low overhead during profiling. - (:func:`os.times` is *pretty* bad, as it returns a tuple of floating point - values). If you want to substitute a better timer in the cleanest fashion, - derive a class and hardwire a replacement dispatch method that best handles your - timer call, along with the appropriate calibration constant. + Be warned that you should calibrate the profiler class for the + timer function that you choose. For most machines, a timer that + returns a lone integer value will provide the best results in terms + of low overhead during profiling. (:func:`os.times` is *pretty* + bad, as it returns a tuple of floating point values). If you want + to substitute a better timer in the cleanest fashion, derive a + class and hardwire a replacement dispatch method that best handles + your timer call, along with the appropriate calibration constant. :class:`cProfile.Profile` - :func:`your_time_func` should return a single number. If it returns - integers, you can also invoke the class constructor with a second argument - specifying the real duration of one unit of time. For example, if - :func:`your_integer_time_func` returns times measured in thousands of seconds, - you would construct the :class:`Profile` instance as follows:: + :func:`your_time_func` should return a single number. If it + returns integers, you can also invoke the class constructor with a + second argument specifying the real duration of one unit of time. + For example, if :func:`your_integer_time_func` returns times + measured in thousands of seconds, you would construct the + :class:`Profile` instance as follows:: pr = profile.Profile(your_integer_time_func, 0.001) - As the :mod:`cProfile.Profile` class cannot be calibrated, custom timer - functions should be used with care and should be as fast as possible. For the - best results with a custom timer, it might be necessary to hard-code it in the C - source of the internal :mod:`_lsprof` module. + As the :mod:`cProfile.Profile` class cannot be calibrated, custom + timer functions should be used with care and should be as fast as + possible. For the best results with a custom timer, it might be + necessary to hard-code it in the C source of the internal + :mod:`_lsprof` module. diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py --- a/Lib/test/test_bisect.py +++ b/Lib/test/test_bisect.py @@ -239,7 +239,7 @@ else: f = self.module.insort_right f(insorted, digit) - self.assertEqual(sorted(insorted), insorted) + self.assertEqual(sorted(insorted), insorted) def test_backcompatibility(self): self.assertEqual(self.module.insort, self.module.insort_right) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): merge 3.3
by benjamin.peterson Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/9c2df50b4fe0 changeset: 80142:9c2df50b4fe0 parent: 80121:1698d1ab0b0a parent: 80141:6964a9b6c1ea user: Benjamin Peterson <benjamin(a)python.org> date: Wed Oct 31 19:01:48 2012 -0400 summary: merge 3.3 files: Python/symtable.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Python/symtable.c b/Python/symtable.c --- a/Python/symtable.c +++ b/Python/symtable.c @@ -1202,12 +1202,14 @@ asdl_seq *seq = s->v.Global.names; for (i = 0; i < asdl_seq_LEN(seq); i++) { identifier name = (identifier)asdl_seq_GET(seq, i); - char *c_name = _PyUnicode_AsString(name); long cur = symtable_lookup(st, name); if (cur < 0) return 0; if (cur & (DEF_LOCAL | USE)) { char buf[256]; + char *c_name = _PyUnicode_AsString(name); + if (!c_name) + return 0; if (cur & DEF_LOCAL) PyOS_snprintf(buf, sizeof(buf), GLOBAL_AFTER_ASSIGN, @@ -1229,12 +1231,14 @@ asdl_seq *seq = s->v.Nonlocal.names; for (i = 0; i < asdl_seq_LEN(seq); i++) { identifier name = (identifier)asdl_seq_GET(seq, i); - char *c_name = _PyUnicode_AsString(name); long cur = symtable_lookup(st, name); if (cur < 0) return 0; if (cur & (DEF_LOCAL | USE)) { char buf[256]; + char *c_name = _PyUnicode_AsString(name); + if (!c_name) + return 0; if (cur & DEF_LOCAL) PyOS_snprintf(buf, sizeof(buf), NONLOCAL_AFTER_ASSIGN, -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): check return value of _PyUnicode_AsString
by benjamin.peterson Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/6964a9b6c1ea changeset: 80141:6964a9b6c1ea branch: 3.3 parent: 80120:4b842da2b0ac user: Benjamin Peterson <benjamin(a)python.org> date: Wed Oct 31 19:01:42 2012 -0400 summary: check return value of _PyUnicode_AsString files: Python/symtable.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Python/symtable.c b/Python/symtable.c --- a/Python/symtable.c +++ b/Python/symtable.c @@ -1202,12 +1202,14 @@ asdl_seq *seq = s->v.Global.names; for (i = 0; i < asdl_seq_LEN(seq); i++) { identifier name = (identifier)asdl_seq_GET(seq, i); - char *c_name = _PyUnicode_AsString(name); long cur = symtable_lookup(st, name); if (cur < 0) return 0; if (cur & (DEF_LOCAL | USE)) { char buf[256]; + char *c_name = _PyUnicode_AsString(name); + if (!c_name) + return 0; if (cur & DEF_LOCAL) PyOS_snprintf(buf, sizeof(buf), GLOBAL_AFTER_ASSIGN, @@ -1229,12 +1231,14 @@ asdl_seq *seq = s->v.Nonlocal.names; for (i = 0; i < asdl_seq_LEN(seq); i++) { identifier name = (identifier)asdl_seq_GET(seq, i); - char *c_name = _PyUnicode_AsString(name); long cur = symtable_lookup(st, name); if (cur < 0) return 0; if (cur & (DEF_LOCAL | USE)) { char buf[256]; + char *c_name = _PyUnicode_AsString(name); + if (!c_name) + return 0; if (cur & DEF_LOCAL) PyOS_snprintf(buf, sizeof(buf), NONLOCAL_AFTER_ASSIGN, -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #15441, #15478: Reenable test_nonascii_abspath() on Windows
by victor.stinner Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/b3434c1ae503 changeset: 80140:b3434c1ae503 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Oct 31 23:01:30 2012 +0100 summary: Issue #15441, #15478: Reenable test_nonascii_abspath() on Windows The real bug (issue #15478) has been fixed correctly. files: Lib/test/test_genericpath.py | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py --- a/Lib/test/test_genericpath.py +++ b/Lib/test/test_genericpath.py @@ -311,14 +311,10 @@ @unittest.skipIf(sys.platform == 'darwin', "Mac OS X denies the creation of a directory with an invalid utf8 name") def test_nonascii_abspath(self): - name = b'\xe7w\xf0' - if sys.platform == 'win32': - try: - os.fsdecode(name) - except UnicodeDecodeError: - self.skipTest("the filename %a is not decodable " - "from the ANSI code page %s" - % (name, sys.getfilesystemencoding())) + if support.TESTFN_UNDECODABLE: + name = support.TESTFN_UNDECODABLE + else: + name = b'a\xffb\xe7w\xf0' # Test non-ASCII, non-UTF8 bytes in the path. with warnings.catch_warnings(): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #15478: Use source filename in OSError, not destination filename
by victor.stinner Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/6903f5214e99 changeset: 80139:6903f5214e99 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Oct 31 22:47:43 2012 +0100 summary: Issue #15478: Use source filename in OSError, not destination filename And other fixes for Windows: * rename, replace and link require arguments of the same type on Windows * readlink only supports unicode filenames on Windows * os.open() specifies the filename on OSError files: Lib/test/test_os.py | 86 ++++++++++++++++++------------ Modules/posixmodule.c | 14 +--- 2 files changed, 53 insertions(+), 47 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2051,68 +2051,82 @@ class Str(str): pass - self.filenames = [] + self.bytes_filenames = [] + self.unicode_filenames = [] if support.TESTFN_UNENCODABLE is not None: decoded = support.TESTFN_UNENCODABLE else: decoded = support.TESTFN - self.filenames.append(decoded) - self.filenames.append(Str(decoded)) + self.unicode_filenames.append(decoded) + self.unicode_filenames.append(Str(decoded)) if support.TESTFN_UNDECODABLE is not None: encoded = support.TESTFN_UNDECODABLE else: encoded = os.fsencode(support.TESTFN) - self.filenames.append(encoded) - self.filenames.append(memoryview(encoded)) + self.bytes_filenames.append(encoded) + self.bytes_filenames.append(memoryview(encoded)) + + self.filenames = self.bytes_filenames + self.unicode_filenames def test_oserror_filename(self): funcs = [ - (os.chdir,), - (os.chmod, 0o777), - (os.listdir,), - (os.lstat,), - (os.open, os.O_RDONLY), - (os.rename, "dst"), - (os.replace, "dst"), - (os.rmdir,), - (os.stat,), - (os.unlink,), + (self.filenames, os.chdir,), + (self.filenames, os.chmod, 0o777), + (self.filenames, os.listdir,), + (self.filenames, os.lstat,), + (self.filenames, os.open, os.O_RDONLY), + (self.filenames, os.rmdir,), + (self.filenames, os.stat,), + (self.filenames, os.unlink,), ] + if sys.platform == "win32": + funcs.extend(( + (self.bytes_filenames, os.rename, b"dst"), + (self.bytes_filenames, os.replace, b"dst"), + (self.unicode_filenames, os.rename, "dst"), + (self.unicode_filenames, os.replace, "dst"), + )) + else: + funcs.extend(( + (self.filenames, os.rename, "dst"), + (self.filenames, os.replace, "dst"), + )) if hasattr(os, "chown"): - funcs.append((os.chown, 0, 0)) + funcs.append((self.filenames, os.chown, 0, 0)) if hasattr(os, "lchown"): - funcs.append((os.lchown, 0, 0)) + funcs.append((self.filenames, os.lchown, 0, 0)) if hasattr(os, "truncate"): - funcs.append((os.truncate, 0)) - if sys.platform == "win32": - import nt - funcs.extend(( - (nt._getfullpathname,), - (nt._isdir,), - )) + funcs.append((self.filenames, os.truncate, 0)) if hasattr(os, "chflags"): funcs.extend(( - (os.chflags, 0), - (os.lchflags, 0), + (self.filenames, os.chflags, 0), + (self.filenames, os.lchflags, 0), )) if hasattr(os, "chroot"): - funcs.append((os.chroot,)) + funcs.append((self.filenames, os.chroot,)) if hasattr(os, "link"): - funcs.append((os.link, "dst")) + if sys.platform == "win32": + funcs.append((self.bytes_filenames, os.link, b"dst")) + funcs.append((self.unicode_filenames, os.link, "dst")) + else: + funcs.append((self.filenames, os.link, "dst")) if hasattr(os, "listxattr"): funcs.extend(( - (os.listxattr,), - (os.getxattr, "user.test"), - (os.setxattr, "user.test", b'user'), - (os.removexattr, "user.test"), + (self.filenames, os.listxattr,), + (self.filenames, os.getxattr, "user.test"), + (self.filenames, os.setxattr, "user.test", b'user'), + (self.filenames, os.removexattr, "user.test"), )) if hasattr(os, "lchmod"): - funcs.append((os.lchmod, 0o777)) + funcs.append((self.filenames, os.lchmod, 0o777)) if hasattr(os, "readlink"): - funcs.append((os.readlink,)) + if sys.platform == "win32": + funcs.append((self.unicode_filenames, os.readlink,)) + else: + funcs.append((self.filenames, os.readlink,)) - for func, *func_args in funcs: - for name in self.filenames: + for filenames, func, *func_args in funcs: + for name in filenames: try: func(name, *func_args) except OSError as err: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3054,7 +3054,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = path_error(&dst); + return_value = path_error(&src); goto exit; } #else @@ -3234,7 +3234,6 @@ if (error == ERROR_FILE_NOT_FOUND) goto exit; Py_DECREF(list); - path.func = "FindFirstFile"; list = path_error(&path); goto exit; } @@ -3263,7 +3262,6 @@ it got to the end of the directory. */ if (!result && GetLastError() != ERROR_NO_MORE_FILES) { Py_DECREF(list); - path.func = "FindNextFile"; list = path_error(&path); goto exit; } @@ -3782,7 +3780,7 @@ Py_END_ALLOW_THREADS if (!result) { - return_value = path_error(&dst); + return_value = path_error(&src); goto exit; } @@ -6707,7 +6705,7 @@ Py_END_ALLOW_THREADS if (result) { - return_value = path_error(&dst); + return_value = path_error(&src); goto exit; } #endif @@ -7059,12 +7057,6 @@ Py_END_ALLOW_THREADS if (fd == -1) { -#ifdef MS_WINDOWS - /* force use of posix_error here for exact backwards compatibility */ - if (path.wide) - return_value = posix_error(); - else -#endif return_value = path_error(&path); goto exit; } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #15478: Fix again to fix test_os on Windows
by victor.stinner Oct. 31, 2012

Oct. 31, 2012

http://hg.python.org/cpython/rev/9f696742dbda changeset: 80138:9f696742dbda user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Oct 31 22:16:38 2012 +0100 summary: Issue #15478: Fix again to fix test_os on Windows files: Lib/test/support.py | 2 +- Lib/test/test_os.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -654,7 +654,7 @@ for name in (b'abc\xff', b'\xe7w\xf0'): try: os.fsdecode(name) - except UnicodeDecodeErorr: + except UnicodeDecodeError: TESTFN_UNDECODABLE = name break diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2069,7 +2069,6 @@ funcs = [ (os.chdir,), (os.chmod, 0o777), - (os.lchown, 0, 0), (os.listdir,), (os.lstat,), (os.open, os.O_RDONLY), @@ -2077,15 +2076,19 @@ (os.replace, "dst"), (os.rmdir,), (os.stat,), - (os.truncate, 0), (os.unlink,), ] if hasattr(os, "chown"): funcs.append((os.chown, 0, 0)) + if hasattr(os, "lchown"): + funcs.append((os.lchown, 0, 0)) + if hasattr(os, "truncate"): + funcs.append((os.truncate, 0)) if sys.platform == "win32": + import nt funcs.extend(( - (os._getfullpathname,), - (os._isdir,), + (nt._getfullpathname,), + (nt._isdir,), )) if hasattr(os, "chflags"): funcs.extend(( -- Repository URL: http://hg.python.org/cpython

1 0