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

Proposed by Robert Collins
Status: Merged
Approved by: Jonathan Lange
Approved revision: 306
Merge reported by: Robert Collins
Merged at revision: not available
Proposed branch: lp:~lifeless/testtools/bug-1068685
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 27 lines (+5/-6)
1 file modified
doc/overview.rst (+5/-6)
To merge this branch: bzr merge lp:~lifeless/testtools/bug-1068685
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+144012@code.launchpad.net

Description of the change

Was much simpler than it appeared.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
5testtools is a set of extensions to the Python standard library's unit testing5testtools is a set of extensions to the Python standard library's unit testing
6framework. These extensions have been derived from many years of experience6framework. These extensions have been derived from many years of experience
7with unit testing in Python and come from many different sources. testtools7with unit testing in Python and come from many different sources. testtools
8supports Python versions all the way back to Python 2.4. The next release of8supports Python versions all the way back to Python 2.6.
9testtools will change that to support versions that are maintained by the
10Python community instead, to allow the use of modern language features within
11testtools.
129
13What better way to start than with a contrived code snippet?::10What better way to start than with a contrived code snippet?::
1411
@@ -96,7 +93,9 @@
96--------------------------93--------------------------
9794
98testtools gives you the very latest in unit testing technology in a way that95testtools gives you the very latest in unit testing technology in a way that
99will work with Python 2.6, 2.7 and 3.1.96will work with Python 2.6, 2.7, 3.1 and 3.2.
10097
101If you wish to use testtools with Python 2.4 or 2.5, then please use testtools98If you wish to use testtools with Python 2.4 or 2.5, then please use testtools
1020.9.15.990.9.15. Up to then we supported Python 2.4 and 2.5, but we found the
100constraints involved in not using the newer language features onerous as we
101added more support for versions post Python 3.

Subscribers

People subscribed via source and target branches