/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/upstream_import.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/upstream_import.py
34
34
from .errors import (BzrError, NoSuchFile, BzrCommandError, NotBranchError)
35
35
from .osutils import (pathjoin, isdir, file_iterator, basename,
36
36
                      file_kind, splitpath)
37
 
from .sixish import (
38
 
    text_type,
39
 
    )
40
37
from .trace import warning
41
38
from .transform import resolve_conflicts, cook_conflicts
42
39
from .transport import get_transport
258
255
        # interpret relative to fs encoding, which would match native
259
256
        # behaviour better.
260
257
        relative_path = member.name
261
 
        if not isinstance(relative_path, text_type):
 
258
        if not isinstance(relative_path, str):
262
259
            relative_path = relative_path.decode('utf-8')
263
260
        if prefix is not None:
264
261
            relative_path = relative_path[len(prefix) + 1:]