/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-12 01:45:56 UTC
  • mfrom: (7513.1.2 pypy3)
  • Revision ID: breezy.the.bot@gmail.com-20200612014556-tsc8assk3d0luziu
Avoid deprecated behaviour in ElementTree.

Merged from https://code.launchpad.net/~jelmer/brz/pypy3/+merge/385611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upstream_import.py
16
16
 
17
17
"""Import upstream source into a branch"""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
import errno
22
20
from io import (
23
21
    BytesIO,
34
32
from .errors import (BzrError, NoSuchFile, BzrCommandError, NotBranchError)
35
33
from .osutils import (pathjoin, isdir, file_iterator, basename,
36
34
                      file_kind, splitpath)
37
 
from .sixish import (
38
 
    text_type,
39
 
    )
40
35
from .trace import warning
41
36
from .transform import resolve_conflicts, cook_conflicts
42
37
from .transport import get_transport
258
253
        # interpret relative to fs encoding, which would match native
259
254
        # behaviour better.
260
255
        relative_path = member.name
261
 
        if not isinstance(relative_path, text_type):
 
256
        if not isinstance(relative_path, str):
262
257
            relative_path = relative_path.decode('utf-8')
263
258
        if prefix is not None:
264
259
            relative_path = relative_path[len(prefix) + 1:]