[Python-checkins] cpython (merge 2.6 -> 2.7): Merge: Add versionchanged for #14984, remove extra blank from string.

[r.david.murray]

http://hg.python.org/cpython/rev/48be42b94381
changeset:   85736:48be42b94381
branch:      2.7
parent:      85734:f16855d6d4e1
parent:      85735:1b673e0fd8f3
user:        R David Murray <rdmurray at bitdance.com>
date:        Tue Sep 17 20:10:23 2013 -0400
summary:
  Merge: Add versionchanged for #14984, remove extra blank from string.

files:
  Doc/library/netrc.rst |  2 ++
  Lib/netrc.py          |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Doc/library/netrc.rst b/Doc/library/netrc.rst
--- a/Doc/library/netrc.rst
+++ b/Doc/library/netrc.rst
@@ -32,6 +32,8 @@
    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
 
diff --git a/Lib/netrc.py b/Lib/netrc.py
--- a/Lib/netrc.py
+++ b/Lib/netrc.py
@@ -99,7 +99,7 @@
                             try:
                                 user = pwd.getpwuid(os.getuid())[0]
                             except KeyError:
-                                user = 'uid %s ' % os.getuid()
+                                user = 'uid %s' % os.getuid()
                             raise NetrcParseError(
                                 ("~/.netrc file owner (%s) does not match"
                                  " current user (%s)") % (fowner, user),

-- 
Repository URL: http://hg.python.org/cpython