summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-04-24 09:34:00 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-04-24 09:34:00 -0700
commit1321bc41dfe76a01c98f50c91e429eb69b06ed5e (patch)
treebeb74ec5cbd37091c7dd6a2cd2bbd12fdbdd3740 /sites/www
parenta1d291e04777fb963c1ac76d0d77b3ff7fe0732b (diff)
parentae30b31721fc461c46fc23b768703a3f29ee9939 (diff)
Merge branch '1.13'
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst13
-rw-r--r--sites/www/installing.rst4
2 files changed, 15 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index c9b7bcaf..9f8064fa 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,19 @@
Changelog
=========
+* :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.