Mailman 3 January 2010 - Python-checkins

r77888 - python/branches/py3k/Doc/library/unittest.rst
by georg.brandl 31 Jan '10

31 Jan '10

Author: georg.brandl Date: Sun Jan 31 19:53:23 2010 New Revision: 77888 Log: Fix versionadded:: 2.x merges. 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 Sun Jan 31 19:53:23 2010 @@ -113,7 +113,7 @@ python -m unittest -h -.. versionchanged:: 2.7 +.. versionchanged:: 3.2 In earlier versions it was only possible to run individual test methods and not modules or classes. @@ -126,7 +126,7 @@ Test Discovery -------------- -.. versionadded:: 2.7 +.. versionadded:: 3.2 unittest supports simple test discovery. For a project's tests to be compatible with test discovery they must all be importable from the top level @@ -1084,7 +1084,7 @@ If :meth:`setUp` fails, meaning that :meth:`tearDown` is not called, then any cleanup functions added will still be called. - .. versionadded:: 2.7 + .. versionadded:: 3.2 .. method:: doCleanups() @@ -1100,7 +1100,7 @@ :meth:`doCleanups` pops methods off the stack of cleanup functions one at a time, so it can be called at any time. - .. versionadded:: 2.7 + .. versionadded:: 3.2 .. class:: FunctionTestCase(testFunc, setUp=None, tearDown=None, description=None) @@ -1179,7 +1179,7 @@ (for example when counting tests or comparing for equality) so the tests returned must be the same for repeated iterations. - .. versionchanged:: 2.7 + .. versionchanged:: 3.2 In earlier versions the :class:`TestSuite` accessed tests directly rather than through iteration, so overriding :meth:`__iter__` wasn't sufficient for providing tests. @@ -1227,7 +1227,7 @@ load the tests. This allows modules to customize test loading. This is the `load_tests protocol`_. - .. versionchanged:: 2.7 + .. versionchanged:: 3.2 Support for ``load_tests`` added. @@ -1297,7 +1297,8 @@ ``load_tests`` does not need to pass this argument in to ``loader.discover()``. - .. versionadded:: 2.7 + .. versionadded:: 3.2 + The following attributes of a :class:`TestLoader` can be configured either by subclassing or assignment on an instance: @@ -1431,14 +1432,14 @@ Called once before any tests are executed. - .. versionadded:: 2.7 + .. versionadded:: 3.2 .. method:: stopTestRun(test) Called once after all tests are executed. - .. versionadded:: 2.7 + .. versionadded:: 3.2 .. method:: addError(test, err) @@ -1546,7 +1547,7 @@ Calling ``main`` actually returns an instance of the ``TestProgram`` class. This stores the result of the tests run as the ``result`` attribute. - .. versionchanged:: 2.7 + .. versionchanged:: 3.2 The ``exit`` and ``verbosity`` parameters were added. @@ -1554,7 +1555,7 @@ ################### -.. versionadded:: 2.7 +.. versionadded:: 3.2 Modules or packages can customize how tests are loaded from them during normal

1 0

r77887 - python/trunk/Doc/library/ftplib.rst
by georg.brandl 31 Jan '10

31 Jan '10

Author: georg.brandl Date: Sun Jan 31 19:51:49 2010 New Revision: 77887 Log: Fix-up ftplib documentation: move exception descriptions to toplevel, not inside a class remove attribution in "versionadded" spell and grammar check docstring of FTP_TLS Modified: python/trunk/Doc/library/ftplib.rst Modified: python/trunk/Doc/library/ftplib.rst ============================================================================== --- python/trunk/Doc/library/ftplib.rst (original) +++ python/trunk/Doc/library/ftplib.rst Sun Jan 31 19:51:49 2010 @@ -33,8 +33,8 @@ '226 Transfer complete.' >>> ftp.quit() -The module defines the following items: +The module defines the following items: .. class:: FTP([host[, user[, passwd[, acct[, timeout]]]]]) @@ -49,26 +49,26 @@ .. versionchanged:: 2.6 *timeout* was added. + .. class:: FTP_TLS([host[, user[, passwd[, acct[, keyfile[, certfile[, timeout]]]]]]]) A :class:`FTP` subclass which adds TLS support to FTP as described in :rfc:`4217`. Connect as usual to port 21 implicitly securing the FTP control connection - before authenticating. Securing the data connection requires user to - explicitly ask for it by calling :exc:`prot_p()` method. - *keyfile* and *certfile* are optional - they can contain a PEM formatted - private key and certificate chain file for the SSL connection. + before authenticating. Securing the data connection requires the user to + explicitly ask for it by calling the :meth:`prot_p` method. + *keyfile* and *certfile* are optional -- they can contain a PEM formatted + private key and certificate chain file name for the SSL connection. - .. versionadded:: 2.7 Contributed by Giampaolo Rodola' + .. versionadded:: 2.7 - - Here's a sample session using :class:`FTP_TLS` class: + Here's a sample session using the :class:`FTP_TLS` class: >>> from ftplib import FTP_TLS >>> ftps = FTP_TLS('ftp.python.org') - >>> ftps.login() # login anonimously previously securing control channel - >>> ftps.prot_p() # switch to secure data connection - >>> ftps.retrlines('LIST') # list directory content securely + >>> ftps.login() # login anonymously before securing control channel + >>> ftps.prot_p() # switch to secure data connection + >>> ftps.retrlines('LIST') # list directory content securely total 9 drwxr-xr-x 8 root wheel 1024 Jan 3 1994 . drwxr-xr-x 8 root wheel 1024 Jan 3 1994 .. @@ -84,43 +84,42 @@ >>> +.. exception:: error_reply - .. attribute:: all_errors - - The set of all exceptions (as a tuple) that methods of :class:`FTP` - instances may raise as a result of problems with the FTP connection (as - opposed to programming errors made by the caller). This set includes the - four exceptions listed below as well as :exc:`socket.error` and - :exc:`IOError`. + Exception raised when an unexpected reply is received from the server. - .. exception:: error_reply +.. exception:: error_temp - Exception raised when an unexpected reply is received from the server. + Exception raised when an error code in the range 400--499 is received. - .. exception:: error_temp +.. exception:: error_perm - Exception raised when an error code in the range 400--499 is received. + Exception raised when an error code in the range 500--599 is received. - .. exception:: error_perm +.. exception:: error_proto - Exception raised when an error code in the range 500--599 is received. + Exception raised when a reply is received from the server that does not + begin with a digit in the range 1--5. - .. exception:: error_proto +.. data:: all_errors - Exception raised when a reply is received from the server that does not - begin with a digit in the range 1--5. + The set of all exceptions (as a tuple) that methods of :class:`FTP` + instances may raise as a result of problems with the FTP connection (as + opposed to programming errors made by the caller). This set includes the + four exceptions listed below as well as :exc:`socket.error` and + :exc:`IOError`. .. seealso:: Module :mod:`netrc` - Parser for the :file:`.netrc` file format. The file :file:`.netrc` is typically - used by FTP clients to load user authentication information before prompting the - user. + Parser for the :file:`.netrc` file format. The file :file:`.netrc` is + typically used by FTP clients to load user authentication information + before prompting the user. .. index:: single: ftpmirror.py

1 0

r77886 - in python/trunk/Doc/library: language.rst python.rst
by benjamin.peterson 31 Jan '10

31 Jan '10

Author: benjamin.peterson Date: Sun Jan 31 19:09:34 2010 New Revision: 77886 Log: move distutils.rst to different toc Modified: python/trunk/Doc/library/language.rst python/trunk/Doc/library/python.rst Modified: python/trunk/Doc/library/language.rst ============================================================================== --- python/trunk/Doc/library/language.rst (original) +++ python/trunk/Doc/library/language.rst Sun Jan 31 19:09:34 2010 @@ -27,4 +27,3 @@ compileall.rst dis.rst pickletools.rst - distutils.rst Modified: python/trunk/Doc/library/python.rst ============================================================================== --- python/trunk/Doc/library/python.rst (original) +++ python/trunk/Doc/library/python.rst Sun Jan 31 19:09:34 2010 @@ -27,3 +27,4 @@ site.rst user.rst fpectl.rst + distutils.rst

1 0

r77885 - python/trunk/Lib/test/test_popen.py
by benjamin.peterson 31 Jan '10

31 Jan '10

Author: benjamin.peterson Date: Sun Jan 31 19:02:35 2010 New Revision: 77885 Log: fix windows buildbot Modified: python/trunk/Lib/test/test_popen.py Modified: python/trunk/Lib/test/test_popen.py ============================================================================== --- python/trunk/Lib/test/test_popen.py (original) +++ python/trunk/Lib/test/test_popen.py Sun Jan 31 19:02:35 2010 @@ -17,7 +17,7 @@ class PopenTest(unittest.TestCase): def _do_test_commandline(self, cmdline, expected): - cmd = '"%s" -c "import sys;print sys.argv" %s' % (python, cmdline) + cmd = '%s -c "import sys;print sys.argv" %s' % (python, cmdline) data = os.popen(cmd).read() + '\n' got = eval(data)[1:] # strip off argv[0] self.assertEqual(got, expected)

1 0

r77884 - python/branches/py3k
by benjamin.peterson 31 Jan '10

31 Jan '10

Author: benjamin.peterson Date: Sun Jan 31 18:56:09 2010 New Revision: 77884 Log: Recorded merge of revisions 76050,77704,77752,77759,77761,77815,77821,77828,77834,77842,77846,77850-77851,77875,77879 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r76050 | gregory.p.smith | 2009-11-01 19:37:37 -0600 (Sun, 01 Nov 2009) | 5 lines see http://bugs.python.org/issue1006238 this merges in the following patch to make cross compilation of the chflags check easier: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/files/pytho… ................ r77704 | tarek.ziade | 2010-01-23 03:23:15 -0600 (Sat, 23 Jan 2010) | 1 line taking sysconfig out of distutils ................ r77752 | tarek.ziade | 2010-01-25 17:19:56 -0600 (Mon, 25 Jan 2010) | 1 line switched the call order so this call works without suffering from issue #7774 ................ r77759 | tarek.ziade | 2010-01-26 15:21:54 -0600 (Tue, 26 Jan 2010) | 1 line reintroduced the names in Distutils for APIs that were relocated ................ r77761 | tarek.ziade | 2010-01-26 16:46:15 -0600 (Tue, 26 Jan 2010) | 1 line added local get_platform/set_platform APIs in distutils.sysconfig ................ r77815 | r.david.murray | 2010-01-28 15:16:33 -0600 (Thu, 28 Jan 2010) | 3 lines Change error report when the object passed to suite.addTest is not callable to include the repr of the invalid object. ................ r77821 | mark.dickinson | 2010-01-29 11:11:39 -0600 (Fri, 29 Jan 2010) | 3 lines Issue #7788: Fix a crash produced by deleting a list slice with huge step value. Patch by Marcin Bachry. ................ r77828 | r.david.murray | 2010-01-29 13:35:39 -0600 (Fri, 29 Jan 2010) | 2 lines Fix typo in assertSequenceEqual docstring. ................ r77834 | martin.v.loewis | 2010-01-29 18:15:44 -0600 (Fri, 29 Jan 2010) | 2 lines Add Victor Stinner. ................ r77842 | mark.dickinson | 2010-01-30 04:08:33 -0600 (Sat, 30 Jan 2010) | 4 lines Issue #7767: Add new C-API function PyLong_AsLongLongAndOverflow, a long long variant of PyLong_AsLongAndOverflow. Patch by Case Van Horsen. ................ r77846 | martin.v.loewis | 2010-01-30 04:56:23 -0600 (Sat, 30 Jan 2010) | 13 lines Merged revisions 77419,77435 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r77419 | benjamin.peterson | 2010-01-10 21:39:48 +0100 (So, 10 Jan 2010) | 1 line enclose path in quotes to handle paths with spaces correctly #7666 ........ r77435 | alexandre.vassalotti | 2010-01-12 01:36:54 +0100 (Di, 12 Jan 2010) | 2 lines Issue #1967: Add fixer for dictionary views. ........ ................ r77850 | ezio.melotti | 2010-01-30 07:08:54 -0600 (Sat, 30 Jan 2010) | 1 line Relocate a couple of stars and remove redundant backticks ................ r77851 | ezio.melotti | 2010-01-30 07:27:05 -0600 (Sat, 30 Jan 2010) | 1 line Use the correct markup for args ................ r77875 | matthias.klose | 2010-01-31 10:05:13 -0600 (Sun, 31 Jan 2010) | 3 lines - Update python manual page (options -B, -O0, -s, environment variables PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). ................ r77879 | matthias.klose | 2010-01-31 10:46:26 -0600 (Sun, 31 Jan 2010) | 2 lines - Fix typo in os.execvp docstring. ................ Modified: python/branches/py3k/ (props changed)

1 0

r77883 - python/branches/py3k
by benjamin.peterson 31 Jan '10

31 Jan '10

Author: benjamin.peterson Date: Sun Jan 31 18:50:19 2010 New Revision: 77883 Log: revert svnmerge-integrated property back to a revision before it was broken Modified: python/branches/py3k/ (props changed)

1 0

r77882 - python/branches/release31-maint/Lib/os.py
by matthias.klose 31 Jan '10

31 Jan '10

Author: matthias.klose Date: Sun Jan 31 17:51:26 2010 New Revision: 77882 Log: Merged revisions 77881 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77881 | matthias.klose | 2010-01-31 17:48:44 +0100 (So, 31 Jan 2010) | 9 lines Merged revisions 77879 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77879 | matthias.klose | 2010-01-31 17:46:26 +0100 (So, 31 Jan 2010) | 2 lines - Fix typo in os.execvp docstring. ........ ................ Modified: python/branches/release31-maint/Lib/os.py Modified: python/branches/release31-maint/Lib/os.py ============================================================================== --- python/branches/release31-maint/Lib/os.py (original) +++ python/branches/release31-maint/Lib/os.py Sun Jan 31 17:51:26 2010 @@ -322,7 +322,7 @@ execvpe(file, args[:-1], env) def execvp(file, args): - """execp(file, args) + """execvp(file, args) Execute the executable file (which is searched for along $PATH) with argument list args, replacing the current process.

1 0

r77881 - in python/branches/py3k: Lib/os.py
by matthias.klose 31 Jan '10

31 Jan '10

Author: matthias.klose Date: Sun Jan 31 17:48:44 2010 New Revision: 77881 Log: Merged revisions 77879 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77879 | matthias.klose | 2010-01-31 17:46:26 +0100 (So, 31 Jan 2010) | 2 lines - Fix typo in os.execvp docstring. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/os.py Modified: python/branches/py3k/Lib/os.py ============================================================================== --- python/branches/py3k/Lib/os.py (original) +++ python/branches/py3k/Lib/os.py Sun Jan 31 17:48:44 2010 @@ -322,7 +322,7 @@ execvpe(file, args[:-1], env) def execvp(file, args): - """execp(file, args) + """execvp(file, args) Execute the executable file (which is searched for along $PATH) with argument list args, replacing the current process.

1 0

r77880 - in python/branches/release26-maint: Lib/os.py
by matthias.klose 31 Jan '10

31 Jan '10

Author: matthias.klose Date: Sun Jan 31 17:47:55 2010 New Revision: 77880 Log: Merged revisions 77879 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77879 | matthias.klose | 2010-01-31 17:46:26 +0100 (So, 31 Jan 2010) | 2 lines - Fix typo in os.execvp docstring. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/os.py Modified: python/branches/release26-maint/Lib/os.py ============================================================================== --- python/branches/release26-maint/Lib/os.py (original) +++ python/branches/release26-maint/Lib/os.py Sun Jan 31 17:47:55 2010 @@ -336,7 +336,7 @@ execvpe(file, args[:-1], env) def execvp(file, args): - """execp(file, args) + """execvp(file, args) Execute the executable file (which is searched for along $PATH) with argument list args, replacing the current process.

1 0

r77879 - python/trunk/Lib/os.py
by matthias.klose 31 Jan '10

31 Jan '10

Author: matthias.klose Date: Sun Jan 31 17:46:26 2010 New Revision: 77879 Log: - Fix typo in os.execvp docstring. Modified: python/trunk/Lib/os.py Modified: python/trunk/Lib/os.py ============================================================================== --- python/trunk/Lib/os.py (original) +++ python/trunk/Lib/os.py Sun Jan 31 17:46:26 2010 @@ -336,7 +336,7 @@ execvpe(file, args[:-1], env) def execvp(file, args): - """execp(file, args) + """execvp(file, args) Execute the executable file (which is searched for along $PATH) with argument list args, replacing the current process.

1 0