Mailman 3 November 2013 - Python-checkins

cpython: Some minor clarifications in the documentation of pathlib + inheritance diagram
by eli.bendersky 28 Nov '13

28 Nov '13

http://hg.python.org/cpython/rev/90b56ec318b6 changeset: 87629:90b56ec318b6 parent: 87627:2b2925c08a6c user: Eli Bendersky <eliben(a)gmail.com> date: Thu Nov 28 06:53:05 2013 -0800 summary: Some minor clarifications in the documentation of pathlib + inheritance diagram files: Doc/library/pathlib-inheritance.png | Bin Doc/library/pathlib.rst | 170 ++++++++------- 2 files changed, 91 insertions(+), 79 deletions(-) diff --git a/Doc/library/pathlib-inheritance.png b/Doc/library/pathlib-inheritance.png new file mode 100644 index 0000000000000000000000000000000000000000..b81c3deb6049d83051337776fe5c4f3de751e1cb GIT binary patch [stripped] diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst --- a/Doc/library/pathlib.rst +++ b/Doc/library/pathlib.rst @@ -9,15 +9,27 @@ .. versionadded:: 3.4 - This module offers classes representing filesystem paths with semantics appropriate for different operating systems. Path classes are divided between :ref:`pure paths <pure-paths>`, which provide purely computational operations without I/O, and :ref:`concrete paths <concrete-paths>`, which inherit from pure paths but also provide I/O operations. -The main point of entry is the :class:`Path` class, which will instantiate -a :ref:`concrete path <concrete-paths>` for the current platform. +.. image:: pathlib-inheritance.png + :align: center + +If you've never used this module before or just aren't sure which class is +right for your task, :class:`Path` is most likely what you need. It instantiates +a :ref:`concrete path <concrete-paths>` for the platform the code is running on. + +Pure paths are useful in some special cases; for example: + +#. If you want to manipulate Windows paths on a Unix machine (or vice versa). + You cannot instantiate a :class:`WindowsPath` when running on Unix, but you + can instantiate :class:`PureWindowsPath`. +#. You want to make sure that your code only manipulates paths without actually + accessing the OS. In this case, instantiating one of the pure classes may be + useful since those simply don't have any OS-accessing operations. .. note:: This module has been included in the standard library on a @@ -86,8 +98,57 @@ access a filesystem. There are three ways to access these classes, which we also call *flavours*: +.. class:: PurePath(*pathsegments) -.. class:: PurePosixPath + A generic class that represents the system's path flavour (instantiating + it creates either a :class:`PurePosixPath` or a :class:`PureWindowsPath`):: + + >>> PurePath('setup.py') # Running on a Unix machine + PurePosixPath('setup.py') + + Each element of *pathsegments* can be either a string or bytes object + representing a path segment; it can also be another path object:: + + >>> PurePath('foo', 'some/path', 'bar') + PurePosixPath('foo/some/path/bar') + >>> PurePath(Path('foo'), Path('bar')) + PurePosixPath('foo/bar') + + When *pathsegments* is empty, the current directory is assumed:: + + >>> PurePath() + PurePosixPath('.') + + When several absolute paths are given, the last is taken as an anchor + (mimicking :func:`os.path.join`'s behaviour):: + + >>> PurePath('/etc', '/usr', 'lib64') + PurePosixPath('/usr/lib64') + >>> PureWindowsPath('c:/Windows', 'd:bar') + PureWindowsPath('d:bar') + + However, in a Windows path, changing the local root doesn't discard the + previous drive setting:: + + >>> PureWindowsPath('c:/Windows', '/Program Files') + PureWindowsPath('c:/Program Files') + + Spurious slashes and single dots are collapsed, but double dots (``'..'``) + are not, since this would change the meaning of a path in the face of + symbolic links:: + + >>> PurePath('foo//bar') + PurePosixPath('foo/bar') + >>> PurePath('foo/./bar') + PurePosixPath('foo/bar') + >>> PurePath('foo/../bar') + PurePosixPath('foo/../bar') + + (a naïve approach would make ``PurePosixPath('foo/../bar')`` equivalent + to ``PurePosixPath('bar')``, which is wrong if ``foo`` is a symbolic link + to another directory) + +.. class:: PurePosixPath(*pathsegments) A subclass of :class:`PurePath`, this path flavour represents non-Windows filesystem paths:: @@ -95,7 +156,9 @@ >>> PurePosixPath('/etc') PurePosixPath('/etc') -.. class:: PureWindowsPath + *pathsegments* is specified similarly to :class:`PurePath`. + +.. class:: PureWindowsPath(*pathsegments) A subclass of :class:`PurePath`, this path flavour represents Windows filesystem paths:: @@ -103,67 +166,12 @@ >>> PureWindowsPath('c:/Program Files/') PureWindowsPath('c:/Program Files') -.. class:: PurePath - - A generic class that represents the system's path flavour (instantiating - it creates either a :class:`PurePosixPath` or a :class:`PureWindowsPath`):: - - >>> PurePath('setup.py') - PurePosixPath('setup.py') - + *pathsegments* is specified similarly to :class:`PurePath`. Regardless of the system you're running on, you can instantiate all of these classes, since they don't provide any operation that does system calls. -Constructing paths -^^^^^^^^^^^^^^^^^^ - -Path constructors accept an arbitrary number of positional arguments. -When called without any argument, a path object points to the current -directory:: - - >>> PurePath() - PurePosixPath('.') - -Any argument can be a string or bytes object representing an arbitrary number -of path segments, but it can also be another path object:: - - >>> PurePath('foo', 'some/path', 'bar') - PurePosixPath('foo/some/path/bar') - >>> PurePath(Path('foo'), Path('bar')) - PurePosixPath('foo/bar') - -When several absolute paths are given, the last is taken as an anchor -(mimicking :func:`os.path.join`'s behaviour):: - - >>> PurePath('/etc', '/usr', 'lib64') - PurePosixPath('/usr/lib64') - >>> PureWindowsPath('c:/Windows', 'd:bar') - PureWindowsPath('d:bar') - -However, in a Windows path, changing the local root doesn't discard the -previous drive setting:: - - >>> PureWindowsPath('c:/Windows', '/Program Files') - PureWindowsPath('c:/Program Files') - -Spurious slashes and single dots are collapsed, but double dots (``'..'``) -are not, since this would change the meaning of a path in the face of -symbolic links:: - - >>> PurePath('foo//bar') - PurePosixPath('foo/bar') - >>> PurePath('foo/./bar') - PurePosixPath('foo/bar') - >>> PurePath('foo/../bar') - PurePosixPath('foo/../bar') - -(a naïve approach would make ``PurePosixPath('foo/../bar')`` equivalent -to ``PurePosixPath('bar')``, which is wrong if ``foo`` is a symbolic link -to another directory) - - General properties ^^^^^^^^^^^^^^^^^^ @@ -524,24 +532,7 @@ operations provided by the latter, they also provide methods to do system calls on path objects. There are three ways to instantiate concrete paths: - -.. class:: PosixPath - - A subclass of :class:`Path` and :class:`PurePosixPath`, this class - represents concrete non-Windows filesystem paths:: - - >>> PosixPath('/etc') - PosixPath('/etc') - -.. class:: WindowsPath - - A subclass of :class:`Path` and :class:`PureWindowsPath`, this class - represents concrete Windows filesystem paths:: - - >>> WindowsPath('c:/Program Files/') - WindowsPath('c:/Program Files') - -.. class:: Path +.. class:: Path(*pathsegments) A subclass of :class:`PurePath`, this class represents concrete paths of the system's path flavour (instantiating it creates either a @@ -550,6 +541,27 @@ >>> Path('setup.py') PosixPath('setup.py') + *pathsegments* is specified similarly to :class:`PurePath`. + +.. class:: PosixPath(*pathsegments) + + A subclass of :class:`Path` and :class:`PurePosixPath`, this class + represents concrete non-Windows filesystem paths:: + + >>> PosixPath('/etc') + PosixPath('/etc') + + *pathsegments* is specified similarly to :class:`PurePath`. + +.. class:: WindowsPath(*pathsegments) + + A subclass of :class:`Path` and :class:`PureWindowsPath`, this class + represents concrete Windows filesystem paths:: + + >>> WindowsPath('c:/Program Files/') + WindowsPath('c:/Program Files') + + *pathsegments* is specified similarly to :class:`PurePath`. You can only instantiate the class flavour that corresponds to your system (allowing system calls on non-compatible path flavours could lead to -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix indentation from previous commit
by eli.bendersky 28 Nov '13

28 Nov '13

http://hg.python.org/cpython/rev/3a7a3def6503 changeset: 87628:3a7a3def6503 branch: 2.7 parent: 87624:395a266bcb5a user: Eli Bendersky <eliben(a)gmail.com> date: Thu Nov 28 06:37:25 2013 -0800 summary: Fix indentation from previous commit files: Modules/_elementtree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2339,9 +2339,9 @@ PyObject* suri = NULL; if (uri) - suri = makestring(uri, strlen(uri)); + suri = makestring(uri, strlen(uri)); else - suri = PyString_FromStringAndSize("", 0); + suri = PyString_FromStringAndSize("", 0); if (!suri) return; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #19815: Fix segfault when parsing empty namespace declaration.
by eli.bendersky 28 Nov '13

28 Nov '13

http://hg.python.org/cpython/rev/2b2925c08a6c changeset: 87627:2b2925c08a6c parent: 87623:87858e0b757d parent: 87626:712ebde527c2 user: Eli Bendersky <eliben(a)gmail.com> date: Thu Nov 28 06:35:40 2013 -0800 summary: Issue #19815: Fix segfault when parsing empty namespace declaration. Based on patches by Christian Heimes and Vajrasky Kok files: Lib/test/test_xml_etree.py | 5 +++++ Modules/_elementtree.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -526,6 +526,11 @@ ('end-ns', None), ]) + events = ('start-ns', 'end-ns') + context = iterparse(io.StringIO(r"<root xmlns=''/>"), events) + res = [action for action, elem in context] + self.assertEqual(res, ['start-ns', 'end-ns']) + events = ("start", "end", "bogus") with self.assertRaises(ValueError) as cm: with open(SIMPLE_XMLFILE, "rb") as f: diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -3038,7 +3038,10 @@ if (PyErr_Occurred()) return; - suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict"); + if (uri) + suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict"); + else + suri = PyUnicode_FromString(""); if (!suri) return; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Fix indentation from previous commit
by eli.bendersky 28 Nov '13

28 Nov '13

http://hg.python.org/cpython/rev/712ebde527c2 changeset: 87626:712ebde527c2 branch: 3.3 user: Eli Bendersky <eliben(a)gmail.com> date: Thu Nov 28 06:33:21 2013 -0800 summary: Fix indentation from previous commit files: Modules/_elementtree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2998,9 +2998,9 @@ PyObject* suri = NULL; if (uri) - suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict"); + suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict"); else - suri = PyUnicode_FromString(""); + suri = PyUnicode_FromString(""); if (!suri) return; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #19815: Fix segfault when parsing empty namespace declaration.
by eli.bendersky 28 Nov '13

28 Nov '13

http://hg.python.org/cpython/rev/68f1e5262a7a changeset: 87625:68f1e5262a7a branch: 3.3 parent: 87610:dfadce7635ce user: Eli Bendersky <eliben(a)gmail.com> date: Thu Nov 28 06:31:58 2013 -0800 summary: Issue #19815: Fix segfault when parsing empty namespace declaration. Based on patches by Christian Heimes and Vajrasky Kok files: Lib/test/test_xml_etree.py | 5 +++++ Modules/_elementtree.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -535,6 +535,11 @@ ('end-ns', None), ]) + events = ('start-ns', 'end-ns') + context = iterparse(io.StringIO(r"<root xmlns=''/>"), events) + res = [action for action, elem in context] + self.assertEqual(res, ['start-ns', 'end-ns']) + events = ("start", "end", "bogus") with self.assertRaises(ValueError) as cm: with open(SIMPLE_XMLFILE, "rb") as f: diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2997,7 +2997,10 @@ PyObject* sprefix = NULL; PyObject* suri = NULL; - suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict"); + if (uri) + suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict"); + else + suri = PyUnicode_FromString(""); if (!suri) return; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #19815: Fix segfault when parsing empty namespace declaration.
by eli.bendersky 28 Nov '13

28 Nov '13

http://hg.python.org/cpython/rev/395a266bcb5a changeset: 87624:395a266bcb5a branch: 2.7 parent: 87609:e5b7f140ae30 user: Eli Bendersky <eliben(a)gmail.com> date: Thu Nov 28 06:25:45 2013 -0800 summary: Issue #19815: Fix segfault when parsing empty namespace declaration. Based on patches by Christian Heimes and Vajrasky Kok files: Lib/test/test_xml_etree.py | 11 +++++++++-- Modules/_elementtree.c | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -713,14 +713,21 @@ end {namespace}root end-ns None + >>> import StringIO + + >>> events = ('start-ns', 'end-ns') + >>> context = ET.iterparse(StringIO.StringIO(r"<root xmlns=''/>"), events) + >>> for action, elem in context: + ... print action, elem + start-ns ('', '') + end-ns None + >>> events = ("start", "end", "bogus") >>> with open(SIMPLE_XMLFILE, "rb") as f: ... iterparse(f, events) Traceback (most recent call last): ValueError: unknown event 'bogus' - >>> import StringIO - >>> source = StringIO.StringIO( ... "<?xml version='1.0' encoding='iso-8859-1'?>\\n" ... "<body xmlns='http://éffbot.org/ns'\\n" diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2338,7 +2338,10 @@ PyObject* sprefix = NULL; PyObject* suri = NULL; - suri = makestring(uri, strlen(uri)); + if (uri) + suri = makestring(uri, strlen(uri)); + else + suri = PyString_FromStringAndSize("", 0); if (!suri) return; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: SNI was added in OpenSSL 0.9.8f [11 Oct 2007], too
by christian.heimes 28 Nov '13

28 Nov '13

http://hg.python.org/cpython/rev/87858e0b757d changeset: 87623:87858e0b757d user: Christian Heimes <christian(a)cheimes.de> date: Thu Nov 28 15:12:15 2013 +0100 summary: SNI was added in OpenSSL 0.9.8f [11 Oct 2007], too files: Modules/_ssl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -97,7 +97,7 @@ # define HAVE_TLSv1_2 0 #endif -/* SNI support (client- and server-side) appeared in OpenSSL 1.0.0. +/* SNI support (client- and server-side) appeared in OpenSSL 1.0.0 and 0.9.8f * This includes the SSL_set_SSL_CTX() function. */ #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (acabd3f035fe): sum=0
by solipsis＠pitrou.net 28 Nov '13

28 Nov '13

results for acabd3f035fe on branch "default" -------------------------------------------- test_site leaked [-2, 0, 2] references, sum=0 test_site leaked [-2, 0, 2] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogXqtArS', '-x']

1 0

cpython: ssl.create_default_context() sets OP_NO_COMPRESSION to prevent CRIME
by christian.heimes 27 Nov '13

27 Nov '13

http://hg.python.org/cpython/rev/98eb88d3d94e changeset: 87622:98eb88d3d94e user: Christian Heimes <christian(a)cheimes.de> date: Thu Nov 28 08:06:54 2013 +0100 summary: ssl.create_default_context() sets OP_NO_COMPRESSION to prevent CRIME files: Lib/ssl.py | 2 ++ Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/ssl.py b/Lib/ssl.py --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -383,6 +383,8 @@ context = SSLContext(PROTOCOL_TLSv1) # SSLv2 considered harmful. context.options |= OP_NO_SSLv2 + # disable compression to prevent CRIME attacks (OpenSSL 1.0+) + context.options |= getattr(_ssl, "OP_NO_COMPRESSION", 0) # disallow ciphers with known vulnerabilities context.set_ciphers(_RESTRICTED_CIPHERS) # verify certs in client mode diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -18,6 +18,8 @@ Library ------- +- ssl.create_default_context() sets OP_NO_COMPRESSION to prevent CRIME. + - Issue #19802: Add socket.SO_PRIORITY. - Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #19595: Re-enable a long-disabled test in test_winsound
by zach.ware 27 Nov '13

27 Nov '13

http://hg.python.org/cpython/rev/6f1c5d0b44ed changeset: 87621:6f1c5d0b44ed user: Zachary Ware <zachary.ware(a)gmail.com> date: Wed Nov 27 23:56:04 2013 -0600 summary: Issue #19595: Re-enable a long-disabled test in test_winsound files: Lib/test/test_winsound.py | 20 ++++++++------------ Misc/NEWS | 2 ++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -158,18 +158,14 @@ ) def test_alias_fallback(self): - # This test can't be expected to work on all systems. The MS - # PlaySound() docs say: - # - # If it cannot find the specified sound, PlaySound uses the - # default system event sound entry instead. If the function - # can find neither the system default entry nor the default - # sound, it makes no sound and returns FALSE. - # - # It's known to return FALSE on some real systems. - - # winsound.PlaySound('!"$%&/(#+*', winsound.SND_ALIAS) - return + if _have_soundcard(): + winsound.PlaySound('!"$%&/(#+*', winsound.SND_ALIAS) + else: + self.assertRaises( + RuntimeError, + winsound.PlaySound, + '!"$%&/(#+*', winsound.SND_ALIAS + ) def test_alias_nofallback(self): if _have_soundcard(): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -31,6 +31,8 @@ Tests ----- +- Issue #19595: Re-enabled a long-disabled test in test_winsound. + - Issue #19588: Fixed tests in test_random that were silently skipped most of the time. Patch by Julian Gindi. -- Repository URL: http://hg.python.org/cpython

1 0