From 6a4f42189211fecb9c8829d527949bb42641689c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Bryon?= <benoit@marmelune.net>
Date: Tue, 5 Nov 2013 11:53:29 +0100
Subject: [PATCH] Dropped support (tests) for Python 2.6.

---
 .travis.yml |  1 -
 CHANGELOG   | 56 ++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a008ad..9d1a631 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
 install: make configure develop
 script: make test
diff --git a/CHANGELOG b/CHANGELOG
index fc6b5f9..70e669c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,25 +4,63 @@ Changelog
 1.3 (unreleased)
 ----------------
 
-Big refactoring around Nginx middleware.
+Big refactoring around middleware configuration, API readability and
+documentation.
+
+- Bugfix #44 - Introduced ``django_downloadview.File``, which patches
+  ``django.core.files.base.File.__iter__()`` implementation.
+  See https://code.djangoproject.com/ticket/21321
+
+- Bugfix #?? - Fixed ``basename`` assertion in
+  :func:`~django_downloadview.test.assert_download_response`: always use
+  ``Content-Disposition`` header.
+
+- Bugfix #?? - Fixed ``content`` assertion in 
+  :func:`~django_downloadview.test.assert_download_response`: use only
+  ``streaming_content`` attribute, whatever the file wrapper.
+
+- Feature #?? - Introduced
+  :class:`~django_downloadview.middlewares.DownloadDispatcherMiddleware` that
+  iterates over a list of configurable download middlewares. Allows to plug
+  several download middlewares with different configurations. Deprecates the
+  settings related to previous single-and-global middleware.
+
+- Refactoring #?? - Dropped support of Python 2.6
+
+- Refactoring #?? - ObjectDownloadView now inherits from SingleObjectMixin and
+  BaseDownloadView (was DownloadMixin and BaseDetailView).
+
+- Refactoring #?? - Documentation includes examples from demo project.
+
+- Refactoring #?? - Documentation focuses on usage, rather than API.
+
+- Refactoring #?? - Added base classes in
+  :mod:`django_downloadview.middlewares`, such as
+  :class:`~django_downloadview.middlewares.ProxiedDownloadMiddleware`.
 
-- Feature #?? - Introduced DownloadDispatcherMiddleware that iterates over a
-  list of configurable download middlewares. Allows to plug several download
-  middlewares with different configurations. Deprecates the settings related
-  to previous single-and-global middleware.
 - Refactoring #?? - Splitted nginx module in a package.
+
 - Refactoring #?? - Expose most Python API directly in `django_downloadview`
-  package. Simplifies imports in client applications.
+  package. Simplifies ``import`` statements in client applications.
+
+- Refactoring #?? - Simplified DownloadMixin.render_to_response() signature.
+
+- Added unit tests, improved code coverage.
+
 
 1.2 (2013-05-28)
 ----------------
 
 Bugfixes and documentation improvements.
 
-- Bug #26 - Prevented computation of virtual file's size, unless the file
+- Bugfix #26 - Prevented computation of virtual file's size, unless the file
   wrapper implements was_modified_since() method.
-- Bug #34 - Improved support of files that do not implement modification time.
-- Bug #35 - Fixed README conversion from reStructuredText to HTML (PyPI).
+
+- Bugfix #34 - Improved support of files that do not implement modification
+  time.
+
+- Bugfix #35 - Fixed README conversion from reStructuredText to HTML (PyPI).
+
 
 1.1 (2013-04-11)
 ----------------