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

This commit is contained in:
R David Murray 2013-09-17 20:10:23 -04:00
commit ba58e1d827
2 changed files with 3 additions and 1 deletions

View File

@ -32,6 +32,8 @@ the Unix :program:`ftp` program and other FTP clients.
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

View File

@ -99,7 +99,7 @@ class netrc:
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),