Merge lp:~lifeless/testtools/bug-1068685 into lp:~testtools-committers/testtools/trunk

[Robert Collins]

Was much simpler than it appeared.

[Jonathan Lange (jml)]

review: Approve

=== modified file 'doc/overview.rst'
--- doc/overview.rst	2012-09-17 11:44:55 +0000
+++ doc/overview.rst	2013-01-20 08:36:22 +0000
@@ -5,10 +5,7 @@
 testtools is a set of extensions to the Python standard library's unit testing
 framework. These extensions have been derived from many years of experience
 with unit testing in Python and come from many different sources. testtools
-supports Python versions all the way back to Python 2.4. The next release of
-testtools will change that to support versions that are maintained by the
-Python community instead, to allow the use of modern language features within
-testtools.
+supports Python versions all the way back to Python 2.6.
 
 What better way to start than with a contrived code snippet?::
 
@@ -96,7 +93,9 @@
 --------------------------
 
 testtools gives you the very latest in unit testing technology in a way that
-will work with Python 2.6, 2.7 and 3.1.
+will work with Python 2.6, 2.7, 3.1 and 3.2.
 
 If you wish to use testtools with Python 2.4 or 2.5, then please use testtools
-0.9.15.
+0.9.15. Up to then we supported Python 2.4 and 2.5, but we found the
+constraints involved in not using the newer language features onerous as we
+added more support for versions post Python 3.