diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:54:12 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:54:12 -0700 |
| commit | fe9171661a60b9299395c73630ebdbdc76fec342 (patch) | |
| tree | d3c3cc0dce5f519a34d2b8fb676b12a6cb32bc33 /sites/www | |
| parent | e032541b787e74510aa66b0a243ffc1d1a61b7f4 (diff) | |
| parent | a8ad23e61a25d4efaae938ed51228104b6096b14 (diff) | |
Merge branch '1.12' into 1.13
Conflicts:
paramiko/file.py
paramiko/server.py
paramiko/sftp_client.py
sites/www/changelog.rst
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 8b3411a5..af4d9418 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if + type(x) is str/if isinstance(x, basestring)/g``.) Thanks to ``@ksamuel`` for + the report. * :release:`1.13.0 <2014-03-13>` * :release:`1.12.3 <2014-03-13>` * :release:`1.11.5 <2014-03-13>` |