/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/mutabletree.py
29
29
    tree,
30
30
    )
31
31
 
32
 
from .sixish import (
33
 
    text_type,
34
 
    )
35
32
 
36
33
 
37
34
class BadReferenceTarget(errors.InternalBzrError):
101
98
 
102
99
        TODO: Perhaps callback with the ids and paths as they're added.
103
100
        """
104
 
        if isinstance(files, (str, text_type)):
 
101
        if isinstance(files, str):
105
102
            # XXX: Passing a single string is inconsistent and should be
106
103
            # deprecated.
107
104
            if not (ids is None or isinstance(ids, bytes)):
108
105
                raise AssertionError()
109
 
            if not (kinds is None or isinstance(kinds, (str, text_type))):
 
106
            if not (kinds is None or isinstance(kinds, str)):
110
107
                raise AssertionError()
111
108
            files = [files]
112
109
            if ids is not None: