/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/matchers.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/matchers.py
38
38
    osutils,
39
39
    revision as _mod_revision,
40
40
    )
41
 
 
 
41
from ..sixish import (
 
42
    text_type,
 
43
    )
42
44
from ..tree import InterTree
43
45
 
44
46
from testtools.matchers import Equals, Mismatch, Matcher
148
150
        """
149
151
        directories = []
150
152
        for entry in entries:
151
 
            if isinstance(entry, str):
 
153
            if isinstance(entry, (str, text_type)):
152
154
                path = entry
153
155
            else:
154
156
                path = entry[0]
168
170
 
169
171
    def match(self, tree):
170
172
        include_file_ids = self.entries and not isinstance(
171
 
            self.entries[0], str)
 
173
            self.entries[0], (str, text_type))
172
174
        actual = list(self.get_tree_layout(
173
175
            tree, include_file_ids=include_file_ids))
174
176
        if not tree.has_versioned_directories():