Mailman 3 June 2012 - Python-checkins

cpython (3.2): #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on flush()
by petri.lehtinen 29 Jun '12

29 Jun '12

http://hg.python.org/cpython/rev/13fb85ef0eea changeset: 77851:13fb85ef0eea branch: 3.2 parent: 77848:7cf5a629fde2 user: Petri Lehtinen <petri(a)digip.org> date: Fri Jun 29 15:09:12 2012 +0300 summary: #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on flush() files: Lib/mailbox.py | 3 +++ Lib/test/test_mailbox.py | 17 +++++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/Lib/mailbox.py b/Lib/mailbox.py --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -691,6 +691,9 @@ _sync_close(new_file) # self._file is about to get replaced, so no need to sync. self._file.close() + # Make sure the new file's mode is the same as the old file's + mode = os.stat(self._path).st_mode + os.chmod(new_file.name, mode) try: os.rename(new_file.name, self._path) except OSError as e: diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -966,6 +966,23 @@ self._box = self._factory(self._path) self.assertEqual(len(self._box), 1) + def test_permissions_after_flush(self): + # See issue #5346 + + # Make the mailbox world writable. It's unlikely that the new + # mailbox file would have these permissions after flush(), + # because umask usually prevents it. + mode = os.stat(self._path).st_mode | 0o666 + os.chmod(self._path, mode) + + self._box.add(self._template % 0) + i = self._box.add(self._template % 1) + # Need to remove one message to make flush() create a new file + self._box.remove(i) + self._box.flush() + + self.assertEqual(os.stat(self._path).st_mode, mode) + class _TestMboxMMDF(_TestSingleFile): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -81,6 +81,9 @@ Library ------- +- Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox + files on flush(). + - Issue #10571: Fix the "--sign" option of distutils' upload command. Patch by Jakub Wilk. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on flush()
by petri.lehtinen 29 Jun '12

29 Jun '12

http://hg.python.org/cpython/rev/69f654f718f4 changeset: 77850:69f654f718f4 branch: 2.7 parent: 77847:3d7a75e945ee user: Petri Lehtinen <petri(a)digip.org> date: Fri Jun 29 15:09:12 2012 +0300 summary: #5346: Preserve permissions of mbox, MMDF and Babyl mailbox files on flush() files: Lib/mailbox.py | 3 +++ Lib/test/test_mailbox.py | 17 +++++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/Lib/mailbox.py b/Lib/mailbox.py --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -665,6 +665,9 @@ _sync_close(new_file) # self._file is about to get replaced, so no need to sync. self._file.close() + # Make sure the new file's mode is the same as the old file's + mode = os.stat(self._path).st_mode + os.chmod(new_file.name, mode) try: os.rename(new_file.name, self._path) except OSError, e: diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -848,6 +848,23 @@ self._box = self._factory(self._path) self.assertEqual(len(self._box), 1) + def test_permissions_after_flush(self): + # See issue #5346 + + # Make the mailbox world writable. It's unlikely that the new + # mailbox file would have these permissions after flush(), + # because umask usually prevents it. + mode = os.stat(self._path).st_mode | 0o666 + os.chmod(self._path, mode) + + self._box.add(self._template % 0) + i = self._box.add(self._template % 1) + # Need to remove one message to make flush() create a new file + self._box.remove(i) + self._box.flush() + + self.assertEqual(os.stat(self._path).st_mode, mode) + class _TestMboxMMDF(_TestSingleFile): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -75,6 +75,9 @@ Library ------- +- Issue #5346: Preserve permissions of mbox, MMDF and Babyl mailbox + files on flush(). + - Issue #15219: Fix a reference leak when hashlib.new() is called with invalid parameters. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): #9559: Don't call _pre_mailbox_hook more than once
by petri.lehtinen 29 Jun '12

29 Jun '12

http://hg.python.org/cpython/rev/5a0ec296b287 changeset: 77849:5a0ec296b287 parent: 77846:992be49127e1 parent: 77848:7cf5a629fde2 user: Petri Lehtinen <petri(a)digip.org> date: Fri Jun 29 13:51:19 2012 +0300 summary: #9559: Don't call _pre_mailbox_hook more than once files: Lib/mailbox.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/mailbox.py b/Lib/mailbox.py --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -740,8 +740,11 @@ """Append message to mailbox and return (start, stop) offsets.""" self._file.seek(0, 2) before = self._file.tell() - if len(self._toc) == 0: - # This is the first message + if len(self._toc) == 0 and not self._pending: + # This is the first message, and the _pre_mailbox_hook + # hasn't yet been called. If self._pending is True, + # messages have been removed, so _pre_mailbox_hook must + # have been called already. self._pre_mailbox_hook(self._file) try: self._pre_message_hook(self._file) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #9559: Don't call _pre_mailbox_hook more than once
by petri.lehtinen 29 Jun '12

29 Jun '12

http://hg.python.org/cpython/rev/7cf5a629fde2 changeset: 77848:7cf5a629fde2 branch: 3.2 parent: 77844:450e32f8c73a user: Petri Lehtinen <petri(a)digip.org> date: Fri Jun 29 13:43:37 2012 +0300 summary: #9559: Don't call _pre_mailbox_hook more than once files: Lib/mailbox.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/mailbox.py b/Lib/mailbox.py --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -740,8 +740,11 @@ """Append message to mailbox and return (start, stop) offsets.""" self._file.seek(0, 2) before = self._file.tell() - if len(self._toc) == 0: - # This is the first message + if len(self._toc) == 0 and not self._pending: + # This is the first message, and the _pre_mailbox_hook + # hasn't yet been called. If self._pending is True, + # messages have been removed, so _pre_mailbox_hook must + # have been called already. self._pre_mailbox_hook(self._file) try: self._pre_message_hook(self._file) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #9559: Don't call _pre_mailbox_hook more than once
by petri.lehtinen 29 Jun '12

29 Jun '12

http://hg.python.org/cpython/rev/3d7a75e945ee changeset: 77847:3d7a75e945ee branch: 2.7 parent: 77843:bbfee24e5ad2 user: Petri Lehtinen <petri(a)digip.org> date: Fri Jun 29 13:43:37 2012 +0300 summary: #9559: Don't call _pre_mailbox_hook more than once files: Lib/mailbox.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/mailbox.py b/Lib/mailbox.py --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -714,8 +714,11 @@ """Append message to mailbox and return (start, stop) offsets.""" self._file.seek(0, 2) before = self._file.tell() - if len(self._toc) == 0: - # This is the first message + if len(self._toc) == 0 and not self._pending: + # This is the first message, and the _pre_mailbox_hook + # hasn't yet been called. If self._pending is True, + # messages have been removed, so _pre_mailbox_hook must + # have been called already. self._pre_mailbox_hook(self._file) try: self._pre_message_hook(self._file) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Check for all used fd-based functions in shutil.rmdir, closes #15218
by hynek.schlawack 28 Jun '12

28 Jun '12

http://hg.python.org/cpython/rev/992be49127e1 changeset: 77846:992be49127e1 user: Hynek Schlawack <hs(a)ox.cx> date: Fri Jun 29 08:28:20 2012 +0200 summary: Check for all used fd-based functions in shutil.rmdir, closes #15218 files: Lib/shutil.py | 6 ++++-- Lib/test/test_shutil.py | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/shutil.py b/Lib/shutil.py --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -405,8 +405,10 @@ except os.error: onerror(os.unlink, fullname, sys.exc_info()) -_use_fd_functions = (os.unlink in os.supports_dir_fd and - os.open in os.supports_dir_fd) +_use_fd_functions = ({os.open, os.stat, os.unlink, os.rmdir} <= + os.supports_dir_fd and + os.listdir in os.supports_fd and + os.stat in os.supports_follow_symlinks) def rmtree(path, ignore_errors=False, onerror=None): """Recursively delete a directory tree. diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -524,7 +524,11 @@ self.assertFalse(os.path.islink(dst)) def test_rmtree_uses_safe_fd_version_if_available(self): - if os.unlink in os.supports_dir_fd and os.open in os.supports_dir_fd: + _use_fd_functions = ({os.open, os.stat, os.unlink, os.rmdir} <= + os.supports_dir_fd and + os.listdir in os.supports_fd and + os.stat in os.supports_follow_symlinks) + if _use_fd_functions: self.assertTrue(shutil._use_fd_functions) self.assertTrue(shutil.rmtree.avoids_symlink_attacks) tmp_dir = self.mkdtemp() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): urlparse docs clean up - no reference to earlier draft
by senthil.kumaran 28 Jun '12

28 Jun '12

http://hg.python.org/cpython/rev/5ca7f93bd4ae changeset: 77845:5ca7f93bd4ae parent: 77841:7523ab4e6e06 parent: 77844:450e32f8c73a user: Senthil Kumaran <senthil(a)uthcode.com> date: Thu Jun 28 21:08:27 2012 -0700 summary: urlparse docs clean up - no reference to earlier draft files: Doc/library/urllib.parse.rst | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -22,11 +22,11 @@ to an absolute URL given a "base URL." The module has been designed to match the Internet RFC on Relative Uniform -Resource Locators (and discovered a bug in an earlier draft!). It supports the -following URL schemes: ``file``, ``ftp``, ``gopher``, ``hdl``, ``http``, -``https``, ``imap``, ``mailto``, ``mms``, ``news``, ``nntp``, ``prospero``, -``rsync``, ``rtsp``, ``rtspu``, ``sftp``, ``shttp``, ``sip``, ``sips``, -``snews``, ``svn``, ``svn+ssh``, ``telnet``, ``wais``. +Resource Locators. It supports the following URL schemes: ``file``, ``ftp``, +``gopher``, ``hdl``, ``http``, ``https``, ``imap``, ``mailto``, ``mms``, +``news``, ``nntp``, ``prospero``, ``rsync``, ``rtsp``, ``rtspu``, ``sftp``, +``shttp``, ``sip``, ``sips``, ``snews``, ``svn``, ``svn+ssh``, ``telnet``, +``wais``. The :mod:`urllib.parse` module defines functions that fall into two broad categories: URL parsing and URL quoting. These are covered in detail in -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): urlparse docs clean up
by senthil.kumaran 28 Jun '12

28 Jun '12

http://hg.python.org/cpython/rev/bbfee24e5ad2 changeset: 77843:bbfee24e5ad2 branch: 2.7 user: Senthil Kumaran <senthil(a)uthcode.com> date: Thu Jun 28 21:07:32 2012 -0700 summary: urlparse docs clean up files: Doc/library/urlparse.rst | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst --- a/Doc/library/urlparse.rst +++ b/Doc/library/urlparse.rst @@ -27,11 +27,11 @@ to an absolute URL given a "base URL." The module has been designed to match the Internet RFC on Relative Uniform -Resource Locators (and discovered a bug in an earlier draft!). It supports the -following URL schemes: ``file``, ``ftp``, ``gopher``, ``hdl``, ``http``, -``https``, ``imap``, ``mailto``, ``mms``, ``news``, ``nntp``, ``prospero``, -``rsync``, ``rtsp``, ``rtspu``, ``sftp``, ``shttp``, ``sip``, ``sips``, -``snews``, ``svn``, ``svn+ssh``, ``telnet``, ``wais``. +Resource Locators. It supports the following URL schemes: ``file``, ``ftp``, +``gopher``, ``hdl``, ``http``, ``https``, ``imap``, ``mailto``, ``mms``, +``news``, ``nntp``, ``prospero``, ``rsync``, ``rtsp``, ``rtspu``, ``sftp``, +``shttp``, ``sip``, ``sips``, ``snews``, ``svn``, ``svn+ssh``, ``telnet``, +``wais``. .. versionadded:: 2.5 Support for the ``sftp`` and ``sips`` schemes. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): urlparse docs clean up - no reference to earlier draft
by senthil.kumaran 28 Jun '12

28 Jun '12

http://hg.python.org/cpython/rev/450e32f8c73a changeset: 77844:450e32f8c73a branch: 3.2 parent: 77840:9854520c8200 user: Senthil Kumaran <senthil(a)uthcode.com> date: Thu Jun 28 21:07:58 2012 -0700 summary: urlparse docs clean up - no reference to earlier draft files: Doc/library/urllib.parse.rst | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -22,11 +22,11 @@ to an absolute URL given a "base URL." The module has been designed to match the Internet RFC on Relative Uniform -Resource Locators (and discovered a bug in an earlier draft!). It supports the -following URL schemes: ``file``, ``ftp``, ``gopher``, ``hdl``, ``http``, -``https``, ``imap``, ``mailto``, ``mms``, ``news``, ``nntp``, ``prospero``, -``rsync``, ``rtsp``, ``rtspu``, ``sftp``, ``shttp``, ``sip``, ``sips``, -``snews``, ``svn``, ``svn+ssh``, ``telnet``, ``wais``. +Resource Locators. It supports the following URL schemes: ``file``, ``ftp``, +``gopher``, ``hdl``, ``http``, ``https``, ``imap``, ``mailto``, ``mms``, +``news``, ``nntp``, ``prospero``, ``rsync``, ``rtsp``, ``rtspu``, ``sftp``, +``shttp``, ``sip``, ``sips``, ``snews``, ``svn``, ``svn+ssh``, ``telnet``, +``wais``. The :mod:`urllib.parse` module defines functions that fall into two broad categories: URL parsing and URL quoting. These are covered in detail in -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (7523ab4e6e06): sum=0
by solipsis＠pitrou.net 28 Jun '12

28 Jun '12

results for 7523ab4e6e06 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog8VIqHB', '-x']

1 0