/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

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 ..tree import (
49
 
    find_previous_path,
50
 
    InterTree,
 
48
from ..sixish import (
 
49
    text_type,
51
50
    )
 
51
from ..tree import InterTree
52
52
 
53
53
from testtools.matchers import Equals, Mismatch, Matcher
54
54
 
157
157
        """
158
158
        directories = []
159
159
        for entry in entries:
160
 
            if isinstance(entry, str):
 
160
            if isinstance(entry, (str, text_type)):
161
161
                path = entry
162
162
            else:
163
163
                path = entry[0]
177
177
 
178
178
    def match(self, tree):
179
179
        include_file_ids = self.entries and not isinstance(
180
 
            self.entries[0], str)
 
180
            self.entries[0], (str, text_type))
181
181
        actual = list(self.get_tree_layout(
182
182
            tree, include_file_ids=include_file_ids))
183
183
        if not tree.has_versioned_directories():