diff options
| author | Chris McDonough <chrism@plope.com> | 2014-06-09 15:37:07 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-06-09 15:37:07 -0400 |
| commit | b6498fce8c1418f3c7b33d31aa9c151a86bc4166 (patch) | |
| tree | 340c5dfa5b2d76c087e319e922e38b9693ac26d8 /CHANGES.txt | |
| parent | cd1d8d278105137a2ca46e39d0a6dea43075eedd (diff) | |
| parent | 32602159eeef8595c7db6edbf1461c58e9ff0349 (diff) | |
| download | pyramid-b6498fce8c1418f3c7b33d31aa9c151a86bc4166.tar.gz pyramid-b6498fce8c1418f3c7b33d31aa9c151a86bc4166.tar.bz2 pyramid-b6498fce8c1418f3c7b33d31aa9c151a86bc4166.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e60c6efac..51af8ee01 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -20,6 +20,11 @@ Bug Fixes - Fix an issue where a ``pyramid.response.FileResponse`` may apply a charset where it does not belong. See https://github.com/Pylons/pyramid/pull/1251 +- Work around a bug introduced in Python 2.7.7 on Windows where + ``mimetypes.guess_type`` returns Unicode rather than str for the content + type, unlike any previous version of Python. See + https://github.com/Pylons/pyramid/issues/1360 for more information. + Docs ---- |