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

[Jonathan Lange]

Re-expose DirContains

Oops

=== modified file 'NEWS'
--- NEWS	2012-10-25 13:46:40 +0000
+++ NEWS	2012-10-25 14:22:18 +0000
@@ -3,6 +3,16 @@
 
 Changes and improvements to testtools_, grouped by release.
 
+NEXT
+~~~~
+
+Improvements
+------------
+
+* ``DirContains`` correctly exposed, after being accidentally hidden in the
+  great matcher re-organization of 0.9.17.  (Jonathan Lange)
+
+
 0.9.20
 ~~~~~~
 

=== 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 @@
 # If the releaselevel is 'final', then the tarball will be major.minor.micro.
 # Otherwise it is major.minor.micro~$(revno).
 
-__version__ = (0, 9, 20, 'final', 0)
+__version__ = (0, 9, 21, 'dev', 0)

=== 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 @@
     'ContainsAll',
     'ContainedByDict',
     'ContainsDict',
+    'DirContains',
     'DirExists',
     'DocTestMatches',
     'EndsWith',
@@ -84,6 +85,7 @@
     raises,
     )
 from ._filesystem import (
+    DirContains,
     DirExists,
     FileContains,
     FileExists,