Merge branch '1.13'

This commit is contained in:
Jeff Forcier 2014-05-07 14:16:23 -07:00
commit 5ec984960b
3 changed files with 5 additions and 2 deletions

View File

@ -23,7 +23,7 @@ if sys.version_info < (2, 6):
__author__ = "Jeff Forcier <jeff@bitprophet.org>" __author__ = "Jeff Forcier <jeff@bitprophet.org>"
__version__ = "1.13.0" __version__ = "1.13.1"
__version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __version_info__ = tuple([ int(d) for d in __version__.split(".") ])
__license__ = "GNU Lesser General Public License (LGPL)" __license__ = "GNU Lesser General Public License (LGPL)"

View File

@ -56,7 +56,7 @@ if sys.platform == 'darwin':
setup( setup(
name = "paramiko", name = "paramiko",
version = "1.13.0", version = "1.13.1",
description = "SSH2 protocol library", description = "SSH2 protocol library",
long_description = longdesc, long_description = longdesc,
author = "Jeff Forcier", author = "Jeff Forcier",

View File

@ -2,6 +2,9 @@
Changelog Changelog
========= =========
* :release:`1.13.1 <2014-05-07>`
* :release:`1.12.4 <2014-05-07>`
* :release:`1.11.6 <2014-05-07>`
* :bug:`-` `paramiko.file.BufferedFile.read` incorrectly returned text strings * :bug:`-` `paramiko.file.BufferedFile.read` incorrectly returned text strings
after the Python 3 migration, despite bytes being more appropriate for file after the Python 3 migration, despite bytes being more appropriate for file
contents (which may be binary or of an unknown encoding.) This has been contents (which may be binary or of an unknown encoding.) This has been