cpython: 48be42b94381 (original) (raw)

Mercurial > cpython

changeset 85736:48be42b94381 2.7

Merge: Add versionchanged for #14984, remove extra blank from string. [#14984]

R David Murray rdmurray@bitdance.com
date	Tue, 17 Sep 2013 20:10:23 -0400
parents	f16855d6d4e1(current diff)1b673e0fd8f3(diff)
children	041caa64486b
files	Doc/library/netrc.rst Lib/netrc.py
diffstat	2 files changed, 3 insertions(+), 1 deletions(-)[+] [-] Doc/library/netrc.rst 2 Lib/netrc.py 2

line wrap: on

line diff

--- a/Doc/library/netrc.rst +++ b/Doc/library/netrc.rst @@ -32,6 +32,8 @@ the Unix :program:ftp program and othe This implements security behavior equivalent to that of ftp and other programs that use :file:.netrc.

.. versionchanged:: 2.7.6 Added the POSIX permissions check. +

.. exception:: NetrcParseError

--- a/Lib/netrc.py +++ b/Lib/netrc.py @@ -99,7 +99,7 @@ class netrc: try: user = pwd.getpwuid(os.getuid())[0] except KeyError:

                           user = 'uid %s ' % os.getuid()[](#l2.7)

                           user = 'uid %s' % os.getuid()[](#l2.8)
                       raise NetrcParseError([](#l2.9)
                           ("~/.netrc file owner (%s) does not match"[](#l2.10)
                            " current user (%s)") % (fowner, user),[](#l2.11)