Mailman 3 November 2010 - Python-checkins

r86824 - python/branches/py3k/Doc/library/unittest.rst
by eric.araujo Nov. 26, 2010

Nov. 26, 2010

Author: eric.araujo Date: Sat Nov 27 00:46:18 2010 New Revision: 86824 Log: Rewrap long lines + minor edits Modified: python/branches/py3k/Doc/library/unittest.rst Modified: python/branches/py3k/Doc/library/unittest.rst ============================================================================== --- python/branches/py3k/Doc/library/unittest.rst (original) +++ python/branches/py3k/Doc/library/unittest.rst Sat Nov 27 00:46:18 2010 @@ -191,7 +191,7 @@ .. _unittest-command-line-interface: -Command Line Interface +Command-Line Interface ---------------------- The unittest module can be used from the command line to run tests from @@ -221,8 +221,8 @@ not modules or classes. -failfast, catch and buffer command-line options -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Command-line options +~~~~~~~~~~~~~~~~~~~~ :program:`unittest` supports these command-line options: @@ -247,7 +247,8 @@ Stop the test run on the first error or failure. .. versionadded:: 3.2 - The command-line options :option:`-c`, :option:`-b` and :option:`-f` were added. + The command-line options :option:`-b`, :option:`-c` and :option:`-f` + were added. The command line can also be used for test discovery, for running all of the tests in a project or just a subset. @@ -1891,7 +1892,7 @@ >>> main(module='test_module', exit=False) The ``failfast``, ``catchbreak`` and ``buffer`` parameters have the same - effect as the `failfast, catch and buffer command-line options`_. + effect as the same-name `command-line options`_. Calling ``main`` actually returns an instance of the ``TestProgram`` class. This stores the result of the tests run as the ``result`` attribute. @@ -2055,12 +2056,11 @@ --------------- The :option:`-c/--catch <unittest -c>` command-line option to unittest, -along with the ``catchbreak`` -parameter to :func:`unittest.main()`, provide more friendly handling of -control-C during a test run. With catch break behavior enabled control-C will -allow the currently running test to complete, and the test run will then end -and report all the results so far. A second control-c will raise a -:exc:`KeyboardInterrupt` in the usual way. +along with the ``catchbreak`` parameter to :func:`unittest.main()`, provide +more friendly handling of control-C during a test run. With catch break +behavior enabled control-C will allow the currently running test to complete, +and the test run will then end and report all the results so far. A second +control-c will raise a :exc:`KeyboardInterrupt` in the usual way. The control-c handling signal handler attempts to remain compatible with code or tests that install their own :const:`signal.SIGINT` handler. If the ``unittest``

1 0

r86823 - python/branches/py3k/Doc/library/unittest.rst
by eric.araujo Nov. 26, 2010

Nov. 26, 2010

Author: eric.araujo Date: Sat Nov 27 00:31:07 2010 New Revision: 86823 Log: Use link-generating markup (see #9312) Modified: python/branches/py3k/Doc/library/unittest.rst Modified: python/branches/py3k/Doc/library/unittest.rst ============================================================================== --- python/branches/py3k/Doc/library/unittest.rst (original) +++ python/branches/py3k/Doc/library/unittest.rst Sat Nov 27 00:31:07 2010 @@ -2054,7 +2054,8 @@ Signal Handling --------------- -The ``-c``/``--catch`` command-line option to unittest, along with the ``catchbreak`` +The :option:`-c/--catch <unittest -c>` command-line option to unittest, +along with the ``catchbreak`` parameter to :func:`unittest.main()`, provide more friendly handling of control-C during a test run. With catch break behavior enabled control-C will allow the currently running test to complete, and the test run will then end

1 0

r86822 - python/branches/release27-maint
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 20:57:33 2010 New Revision: 86822 Log: Blocked revisions 86300 via svnmerge ........ r86300 | hirokazu.yamamoto | 2010-11-07 23:29:26 +0900 (日, 07 11 2010) | 1 line Issue #6317: Now winsound.PlaySound only accepts unicode with MvL's approval. ........ Modified: python/branches/release27-maint/ (props changed)

1 0

r86821 - python/branches/release31-maint
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 20:51:46 2010 New Revision: 86821 Log: Blocked revisions 86168,86211,86300 via svnmerge ........ r86168 | hirokazu.yamamoto | 2010-11-05 00:21:59 +0900 (金, 05 11 2010) | 1 line Updated PC/VS8.0. (mainly to follow r86137: use temporary dir in make_buildinfo.c) ........ r86211 | hirokazu.yamamoto | 2010-11-06 02:24:13 +0900 (土, 06 11 2010) | 1 line Fixed socket_gethostname() on windows. ........ r86300 | hirokazu.yamamoto | 2010-11-07 23:29:26 +0900 (日, 07 11 2010) | 1 line Issue #6317: Now winsound.PlaySound only accepts unicode with MvL's approval. ........ Modified: python/branches/release31-maint/ (props changed)

1 0

r86820 - python/branches/py3k-stat-on-windows/Lib/test/test_os.py
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 20:19:45 2010 New Revision: 86820 Log: Test didn't fail.... Added debug print. Modified: python/branches/py3k-stat-on-windows/Lib/test/test_os.py Modified: python/branches/py3k-stat-on-windows/Lib/test/test_os.py ============================================================================== --- python/branches/py3k-stat-on-windows/Lib/test/test_os.py (original) +++ python/branches/py3k-stat-on-windows/Lib/test/test_os.py Fri Nov 26 20:19:45 2010 @@ -1160,7 +1160,23 @@ self.assertTrue(os.path.isfile(self.filelink)) self.assertTrue(os.path.islink(self.filelink)) self.check_stat(self.filelink, self.filelink_target) - self.assertFalse(os.stat(self.filelink).st_mode & stat.S_IEXEC) + def f(s): + print("-------->", s, oct(s.st_mode)) + self.assertFalse(s.st_mode & stat.S_IEXEC) + print("======================") + print(">>>>", oct(stat.S_IEXEC)) + f(os.stat(self.filelink)) + f(os.lstat(self.filelink)) + f(os.stat(self.filelink_target)) + f(os.lstat(self.filelink_target)) + print("=====================") + path = "foobarbaz.bat" + with open(path, "w") as w: + w.write(path) + f(os.stat(path)) + f(os.lstat(path)) + os.remove(path) + print("======================") def _create_missing_dir_link(self): 'Create a "directory" link to a non-existent target'

1 0

r86819 - python/branches/py3k/Lib/test/test_trace.py
by alexander.belopolsky Nov. 26, 2010

Nov. 26, 2010

Author: alexander.belopolsky Date: Fri Nov 26 19:51:39 2010 New Revision: 86819 Log: Fixed deprecation warnings. Modified: python/branches/py3k/Lib/test/test_trace.py Modified: python/branches/py3k/Lib/test/test_trace.py ============================================================================== --- python/branches/py3k/Lib/test/test_trace.py (original) +++ python/branches/py3k/Lib/test/test_trace.py Fri Nov 26 19:51:39 2010 @@ -330,7 +330,7 @@ lines, cov, module = line.split()[:3] coverage[module] = (int(lines), int(cov[:-1])) # XXX This is needed to run regrtest.py as a script - modname = trace.fullmodname(sys.modules[modname].__file__) + modname = trace._fullmodname(sys.modules[modname].__file__) self.assertIn(modname, coverage) self.assertEqual(coverage[modname], (5, 100)) @@ -340,7 +340,7 @@ class Test_Ignore(unittest.TestCase): def test_ignored(self): jn = os.path.join - ignore = trace.Ignore(['x', 'y.z'], [jn('foo', 'bar')]) + ignore = trace._Ignore(['x', 'y.z'], [jn('foo', 'bar')]) self.assertTrue(ignore.names('x.py', 'x')) self.assertFalse(ignore.names('xy.py', 'xy')) self.assertFalse(ignore.names('y.py', 'y'))

1 0

r86818 - python/branches/py3k-stat-on-windows/Lib/test/test_os.py
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 19:49:07 2010 New Revision: 86818 Log: Added more direct os.link test for os.path.samefile. Modified: python/branches/py3k-stat-on-windows/Lib/test/test_os.py Modified: python/branches/py3k-stat-on-windows/Lib/test/test_os.py ============================================================================== --- python/branches/py3k-stat-on-windows/Lib/test/test_os.py (original) +++ python/branches/py3k-stat-on-windows/Lib/test/test_os.py Fri Nov 26 19:49:07 2010 @@ -878,6 +878,7 @@ f1.write("test") os.link(file1, file2) + self.assertTrue(os.path.samefile(file1, file2)) with open(file1, "r") as f1, open(file2, "r") as f2: self.assertTrue(os.path.sameopenfile(f1.fileno(), f2.fileno()))

1 0

r86816 - python/branches/release31-maint
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 19:30:07 2010 New Revision: 86816 Log: Blocked revisions 86794,86797,86800 via svnmerge ........ r86794 | georg.brandl | 2010-11-26 12:50:13 +0100 (Fr, 26 Nov 2010) | 1 line #10526: fix typo. ........ r86797 | georg.brandl | 2010-11-26 13:05:27 +0100 (Fr, 26 Nov 2010) | 1 line Modernize code in effective(). ........ r86800 | georg.brandl | 2010-11-26 13:10:06 +0100 (Fr, 26 Nov 2010) | 1 line Typo fix. ........ Modified: python/branches/release31-maint/ (props changed)

1 0

r86815 - in python/branches/release31-maint: Doc/extending/embedding.rst Doc/extending/extending.rst Doc/library/bdb.rst Doc/library/builtins.rst Doc/tutorial/stdlib.rst
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 19:29:10 2010 New Revision: 86815 Log: Recorded merge of revisions 86795,86798-86799,86801 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ........ r86795 | georg.brandl | 2010-11-26 12:55:48 +0100 (Fr, 26 Nov 2010) | 1 line Use PyLong_FromLong where appropriate. ........ r86798 | georg.brandl | 2010-11-26 13:05:48 +0100 (Fr, 26 Nov 2010) | 1 line #10420: fix docs of bdb.effective(). ........ r86799 | georg.brandl | 2010-11-26 13:08:19 +0100 (Fr, 26 Nov 2010) | 1 line Remove parenthetical remark that is confusing now that the module is not named "__builtin__" anymore. ........ r86801 | georg.brandl | 2010-11-26 13:12:14 +0100 (Fr, 26 Nov 2010) | 1 line Better example for os.system(): do not change the system time. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/extending/embedding.rst python/branches/release31-maint/Doc/extending/extending.rst python/branches/release31-maint/Doc/library/bdb.rst python/branches/release31-maint/Doc/library/builtins.rst python/branches/release31-maint/Doc/tutorial/stdlib.rst Modified: python/branches/release31-maint/Doc/extending/embedding.rst ============================================================================== --- python/branches/release31-maint/Doc/extending/embedding.rst (original) +++ python/branches/release31-maint/Doc/extending/embedding.rst Fri Nov 26 19:29:10 2010 @@ -209,7 +209,7 @@ { if(!PyArg_ParseTuple(args, ":numargs")) return NULL; - return Py_BuildValue("i", numargs); + return PyLong_FromLong(numargs); } static PyMethodDef EmbMethods[] = { Modified: python/branches/release31-maint/Doc/extending/extending.rst ============================================================================== --- python/branches/release31-maint/Doc/extending/extending.rst (original) +++ python/branches/release31-maint/Doc/extending/extending.rst Fri Nov 26 19:29:10 2010 @@ -74,7 +74,7 @@ if (!PyArg_ParseTuple(args, "s", &command)) return NULL; sts = system(command); - return Py_BuildValue("i", sts); + return PyLong_FromLong(sts); } There is a straightforward translation from the argument list in Python (for @@ -266,13 +266,10 @@ sts = system(command); -Our :func:`spam.system` function must return the value of :cdata:`sts` as a -Python object. This is done using the function :cfunc:`Py_BuildValue`, which is -something like the inverse of :cfunc:`PyArg_ParseTuple`: it takes a format -string and an arbitrary number of C values, and returns a new Python object. -More info on :cfunc:`Py_BuildValue` is given later. :: +Our :func:`spam.system` function must return the value of :c:data:`sts` as a +Python object. This is done using the function :cfunc:`PyLong_FromLong`. :: - return Py_BuildValue("i", sts); + return PyLong_FromLong(sts); In this case, it will return an integer object. (Yes, even integers are objects on the heap in Python!) @@ -1193,7 +1190,7 @@ if (!PyArg_ParseTuple(args, "s", &command)) return NULL; sts = PySpam_System(command); - return Py_BuildValue("i", sts); + return PyLong_FromLong(sts); } In the beginning of the module, right after the line :: Modified: python/branches/release31-maint/Doc/library/bdb.rst ============================================================================== --- python/branches/release31-maint/Doc/library/bdb.rst (original) +++ python/branches/release31-maint/Doc/library/bdb.rst Fri Nov 26 19:29:10 2010 @@ -342,12 +342,10 @@ .. function:: effective(file, line, frame) Determine if there is an effective (active) breakpoint at this line of code. - Return breakpoint number or 0 if none. - - Called only if we know there is a breakpoint at this location. Returns the - breakpoint that was triggered and a flag that indicates if it is ok to delete - a temporary breakpoint. + Return a tuple of the breakpoint and a boolean that indicates if it is ok + to delete a temporary breakpoint. Return ``(None, None)`` if there is no + matching breakpoint. .. function:: set_trace() - Starts debugging with a :class:`Bdb` instance from caller's frame. + Start debugging with a :class:`Bdb` instance from caller's frame. Modified: python/branches/release31-maint/Doc/library/builtins.rst ============================================================================== --- python/branches/release31-maint/Doc/library/builtins.rst (original) +++ python/branches/release31-maint/Doc/library/builtins.rst Fri Nov 26 19:29:10 2010 @@ -32,9 +32,8 @@ # ... -As an implementation detail, most modules have the name ``__builtins__`` (note -the ``'s'``) made available as part of their globals. The value of -``__builtins__`` is normally either this module or the value of this modules's -:attr:`__dict__` attribute. Since this is an implementation detail, it may not -be used by alternate implementations of Python. - +As an implementation detail, most modules have the name ``__builtins__`` made +available as part of their globals. The value of ``__builtins__`` is normally +either this module or the value of this modules's :attr:`__dict__` attribute. +Since this is an implementation detail, it may not be used by alternate +implementations of Python. Modified: python/branches/release31-maint/Doc/tutorial/stdlib.rst ============================================================================== --- python/branches/release31-maint/Doc/tutorial/stdlib.rst (original) +++ python/branches/release31-maint/Doc/tutorial/stdlib.rst Fri Nov 26 19:29:10 2010 @@ -14,11 +14,11 @@ operating system:: >>> import os - >>> os.system('time 0:02') - 0 >>> os.getcwd() # Return the current working directory 'C:\\Python31' - >>> os.chdir('/server/accesslogs') + >>> os.chdir('/server/accesslogs') # Change current working directory + >>> os.system('mkdir today') # Run the command mkdir in the system shell + 0 Be sure to use the ``import os`` style instead of ``from os import *``. This will keep :func:`os.open` from shadowing the built-in :func:`open` function which

1 0

r86814 - python/branches/release27-maint
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 19:26:40 2010 New Revision: 86814 Log: Blocked revisions 86795,86797,86799-86800 via svnmerge ........ r86795 | georg.brandl | 2010-11-26 12:55:48 +0100 (Fr, 26 Nov 2010) | 1 line Use PyLong_FromLong where appropriate. ........ r86797 | georg.brandl | 2010-11-26 13:05:27 +0100 (Fr, 26 Nov 2010) | 1 line Modernize code in effective(). ........ r86799 | georg.brandl | 2010-11-26 13:08:19 +0100 (Fr, 26 Nov 2010) | 1 line Remove parenthetical remark that is confusing now that the module is not named "__builtin__" anymore. ........ r86800 | georg.brandl | 2010-11-26 13:10:06 +0100 (Fr, 26 Nov 2010) | 1 line Typo fix. ........ Modified: python/branches/release27-maint/ (props changed)

1 0