Merge lp:~jml/testtools/expose-dir-contains into lp:~testtools-committers/testtools/trunk

Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: not available
Merged at revision: 288
Proposed branch: lp:~jml/testtools/expose-dir-contains
Merge into: lp:~testtools-committers/testtools/trunk
Diff against target: 50 lines (+13/-1)
3 files modified
NEWS (+10/-0)
testtools/__init__.py (+1/-1)
testtools/matchers/__init__.py (+2/-0)
To merge this branch: bzr merge lp:~jml/testtools/expose-dir-contains
Reviewer Review Type Date Requested Status
testtools committers Pending
Review via email: mp+131422@code.launchpad.net

Commit message

Re-expose DirContains

Description of the change

Oops

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2012-10-25 13:46:40 +0000
+++ NEWS 2012-10-25 14:22:18 +0000
@@ -3,6 +3,16 @@
33
4Changes and improvements to testtools_, grouped by release.4Changes and improvements to testtools_, grouped by release.
55
6NEXT
7~~~~
8
9Improvements
10------------
11
12* ``DirContains`` correctly exposed, after being accidentally hidden in the
13 great matcher re-organization of 0.9.17. (Jonathan Lange)
14
15
60.9.20160.9.20
7~~~~~~17~~~~~~
818
919
=== modified file 'testtools/__init__.py'
--- testtools/__init__.py 2012-10-25 13:46:40 +0000
+++ testtools/__init__.py 2012-10-25 14:22:18 +0000
@@ -86,4 +86,4 @@
86# If the releaselevel is 'final', then the tarball will be major.minor.micro.86# If the releaselevel is 'final', then the tarball will be major.minor.micro.
87# Otherwise it is major.minor.micro~$(revno).87# Otherwise it is major.minor.micro~$(revno).
8888
89__version__ = (0, 9, 20, 'final', 0)89__version__ = (0, 9, 21, 'dev', 0)
9090
=== modified file 'testtools/matchers/__init__.py'
--- testtools/matchers/__init__.py 2012-10-25 13:38:18 +0000
+++ testtools/matchers/__init__.py 2012-10-25 14:22:18 +0000
@@ -20,6 +20,7 @@
20 'ContainsAll',20 'ContainsAll',
21 'ContainedByDict',21 'ContainedByDict',
22 'ContainsDict',22 'ContainsDict',
23 'DirContains',
23 'DirExists',24 'DirExists',
24 'DocTestMatches',25 'DocTestMatches',
25 'EndsWith',26 'EndsWith',
@@ -84,6 +85,7 @@
84 raises,85 raises,
85 )86 )
86from ._filesystem import (87from ._filesystem import (
88 DirContains,
87 DirExists,89 DirExists,
88 FileContains,90 FileContains,
89 FileExists,91 FileExists,

Subscribers

People subscribed via source and target branches