/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-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/matchers.py
45
45
from breezy.bzr.smart.request import request_handlers as smart_request_handlers
46
46
from breezy.bzr.smart import vfs
47
47
""")
48
 
from ..sixish import (
49
 
    text_type,
50
 
    )
51
48
from ..tree import find_previous_path
52
49
 
53
50
from testtools.matchers import Equals, Mismatch, Matcher
157
154
        """
158
155
        directories = []
159
156
        for entry in entries:
160
 
            if isinstance(entry, (str, text_type)):
 
157
            if isinstance(entry, str):
161
158
                path = entry
162
159
            else:
163
160
                path = entry[0]
177
174
 
178
175
    def match(self, tree):
179
176
        include_file_ids = self.entries and not isinstance(
180
 
            self.entries[0], (str, text_type))
 
177
            self.entries[0], str)
181
178
        actual = list(self.get_tree_layout(
182
179
            tree, include_file_ids=include_file_ids))
183
180
        if not tree.has_versioned_directories():