diff options
| author | Anselm Kruis <a.kruis@science-computing.de> | 2014-05-28 00:14:51 +0200 |
|---|---|---|
| committer | Anselm Kruis <a.kruis@science-computing.de> | 2014-05-28 00:14:51 +0200 |
| commit | 8904c15316fbd4dc58f1903479ad559c7677dc2b (patch) | |
| tree | 5f457c09de34951af591fbfaddcff6260d063a27 /sites/www | |
| parent | ce87fc8d7a8a025671183fc78091e5d1f6760f5f (diff) | |
| parent | e811e715833373dd2f2ba898089695eee9c882ed (diff) | |
Merge branch 'master' into gssapi-py3-support
Conflicts:
dev-requirements.txt
sites/www/changelog.rst
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 17 | ||||
| -rw-r--r-- | sites/www/installing.rst | 4 |
2 files changed, 19 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 0680eb38..0de410c7 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -3,6 +3,23 @@ Changelog ========= * :feature:`250` GSS-API / SSPI authenticated Diffie-Hellman Key Exchange and user authentication. +* :release:`1.14.0 <2014-05-07>` +* :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 + 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 + addressed. + + .. note:: + `paramiko.file.BufferedFile.readline` continues to return strings, not + bytes, as "lines" only make sense for textual data. It assumes UTF-8 by + default. + + This should fix `this issue raised on the Obnam mailing list + <http://comments.gmane.org/gmane.comp.sysutils.backup.obnam/252>`_. Thanks + to Antoine Brenner for the patch. * :bug:`-` Added self.args for exception classes. Used for unpickling. Related to (`Fabric #986 <https://github.com/fabric/fabric/issues/986>`_, `Fabric #714 <https://github.com/fabric/fabric/issues/714>`_). Thanks to Alex diff --git a/sites/www/installing.rst b/sites/www/installing.rst index 74c5c6e8..a28ce6cd 100644 --- a/sites/www/installing.rst +++ b/sites/www/installing.rst @@ -20,8 +20,8 @@ We currently support **Python 2.6, 2.7 and 3.3** (Python **3.2** should also work but has a less-strong compatibility guarantee from us.) Users on Python 2.5 or older are urged to upgrade. -Paramiko has two dependencies: the pure-Python ECDSA module `ecdsa`, and the -PyCrypto C extension. `ecdsa` is easily installable from wherever you +Paramiko has two dependencies: the pure-Python ECDSA module ``ecdsa``, and the +PyCrypto C extension. ``ecdsa`` is easily installable from wherever you obtained Paramiko's package; PyCrypto may require more work. Read on for details. |