]> granicus.if.org Git - python/commitdiff
Merge: Add versionchanged for #14984, remove extra blank from string.
authorR David Murray <rdmurray@bitdance.com>
Wed, 18 Sep 2013 00:10:23 +0000 (20:10 -0400)
committerR David Murray <rdmurray@bitdance.com>
Wed, 18 Sep 2013 00:10:23 +0000 (20:10 -0400)
1  2 
Doc/library/netrc.rst
Lib/netrc.py

index c693cea87efed56e02434904cb12b7f22bbbe075,1b53efc542a006bd6832832be27c51d962611e44..713c8dfc41ca3963f785d99d5a495ed1bf5f0f12
@@@ -32,6 -28,8 +32,8 @@@ the Unix :program:`ftp` program and oth
     This implements security behavior equivalent to that of ftp and other
     programs that use :file:`.netrc`.
  
 -   .. versionchanged:: 2.6.9 Added the POSIX permissions check.
++   .. versionchanged:: 2.7.6 Added the POSIX permissions check.
  
  .. exception:: NetrcParseError
  
diff --cc Lib/netrc.py
Simple merge