breaks against newer versions of bzr

newer versions of bzr now provide "match" as a dictionary rather than a plain string. This causes breakage of "bzr log -m" as well as the bzr-search testsuite:

ERROR: bzrlib.plugins.search.tests.test_index.TestLogFilter.test_get_filter_no_index
    log: {{{
5.603 creating repository in file:///tmp/testbzr-Fj8Pww.tmp/bzrlib.plugins.search.tests.test_index.TestLogFilter.test_get_filter_no_index/work/foo/.bzr/.
5.606 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x896390c> in file:///tmp/testbzr-Fj8Pww.tmp/bzrlib.plugins.search.tests.test_index.TestLogFilter.test_get_filter_no_index/work/foo/
5.614 trying to create missing lock '/tmp/testbzr-Fj8Pww.tmp/bzrlib.plugins.search.tests.test_index.TestLogFilter.test_get_filter_no_index/work/foo/.bzr/checkout/dirstate'
5.669 opening working tree '/tmp/testbzr-Fj8Pww.tmp/bzrlib.plugins.search.tests.test_index.TestLogFilter.test_get_filter_no_index/work/foo'
}}}

Traceback (most recent call last):
  File "/build/buildd/bzr-search-1.7.0~bzr86~ppa79~oneiric1/tests/test_index.py", line 745, in test_get_filter_no_index
    tree.branch, False, "\\bword\\b", base_iterator))
  File "/build/buildd/bzr-search-1.7.0~bzr86~ppa79~oneiric1/index.py", line 1487, in make_disable_search_filter
    log_rev_iterator)
  File "/usr/lib/python2.7/dist-packages/bzrlib/log.py", line 870, in _make_search_filter
    for (k,v) in match.iteritems()]
AttributeError: 'str' object has no attribute 'iteritems'