/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/mutabletree.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
 
34
34
from .decorators import needs_read_lock, needs_write_lock
35
35
from .sixish import (
 
36
    text_type,
36
37
    viewvalues,
37
38
    )
38
39
 
106
107
 
107
108
        TODO: Perhaps callback with the ids and paths as they're added.
108
109
        """
109
 
        if isinstance(files, basestring):
 
110
        if isinstance(files, (str, text_type)):
110
111
            # XXX: Passing a single string is inconsistent and should be
111
112
            # deprecated.
112
 
            if not (ids is None or isinstance(ids, basestring)):
 
113
            if not (ids is None or isinstance(ids, (str, text_type))):
113
114
                raise AssertionError()
114
 
            if not (kinds is None or isinstance(kinds, basestring)):
 
115
            if not (kinds is None or isinstance(kinds, (str, text_type))):
115
116
                raise AssertionError()
116
117
            files = [files]
117
118
            if ids is not None: