/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/mutabletree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/mutabletree.py
104
104
        if isinstance(files, (str, text_type)):
105
105
            # XXX: Passing a single string is inconsistent and should be
106
106
            # deprecated.
107
 
            if not (ids is None or isinstance(ids, bytes)):
 
107
            if not (ids is None or isinstance(ids, (str, text_type))):
108
108
                raise AssertionError()
109
109
            if not (kinds is None or isinstance(kinds, (str, text_type))):
110
110
                raise AssertionError()