/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/plugins/weave_fmt/repository.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/plugins/weave_fmt/repository.py
23
23
from __future__ import absolute_import
24
24
 
25
25
import gzip
 
26
from io import BytesIO
26
27
import os
27
28
 
28
29
from ...lazy_import import lazy_import
58
59
from ...bzr.repository import (
59
60
    RepositoryFormatMetaDir,
60
61
    )
61
 
from ...sixish import (
62
 
    BytesIO,
63
 
    text_type,
64
 
    )
65
62
from .store.text import TextStore
66
63
from ...bzr.versionedfile import (
67
64
    AbsentContentFactory,
88
85
        return xml5.serializer_v5
89
86
 
90
87
    def _escape(self, file_or_path):
91
 
        if not isinstance(file_or_path, (str, text_type)):
 
88
        if not isinstance(file_or_path, str):
92
89
            file_or_path = '/'.join(file_or_path)
93
90
        if file_or_path == '':
94
91
            return u''