/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/fastimport/exporter.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/fastimport/exporter.py
47
47
# is not updated (because the parent of commit is already merged, so we don't
48
48
# set new_git_branch to the previously used name)
49
49
 
50
 
try:
51
 
    from email.utils import parseaddr
52
 
except ImportError:  # python < 3
53
 
    from email.Utils import parseaddr
 
50
from email.utils import parseaddr
54
51
import sys
55
52
import time
56
53
import re
66
63
    progress,
67
64
    trace,
68
65
    )
69
 
from ...sixish import (
70
 
    int2byte,
71
 
    PY3,
72
 
    viewitems,
73
 
    )
74
66
 
75
67
from . import (
76
68
    helpers,
140
132
    :param refname: refname to rewrite
141
133
    :return: new refname
142
134
    """
 
135
    import struct
143
136
    new_refname = re.sub(
144
137
        # '/.' in refname or startswith '.'
145
138
        br"/\.|^\."
146
139
        # '..' in refname
147
140
        br"|\.\."
148
141
        # ord(c) < 040
149
 
        br"|[" + b"".join([int2byte(x) for x in range(0o40)]) + br"]"
 
142
        br"|[" + b"".join([bytes([x]) for x in range(0o40)]) + br"]"
150
143
        # c in '\177 ~^:?*['
151
144
        br"|[\177 ~^:?*[]"
152
145
        # last char in "/."
319
312
                  time_required)
320
313
 
321
314
    def print_cmd(self, cmd):
322
 
        if PY3:
323
 
            self.outf.write(b"%s\n" % cmd)
324
 
        else:
325
 
            self.outf.write(b"%r\n" % cmd)
 
315
        self.outf.write(b"%s\n" % cmd)
326
316
 
327
317
    def _save_marks(self):
328
318
        if self.export_marks_file:
651
641
        return path
652
642
 
653
643
    def emit_tags(self):
654
 
        for tag, revid in viewitems(self.branch.tags.get_tag_dict()):
 
644
        for tag, revid in self.branch.tags.get_tag_dict().items():
655
645
            try:
656
646
                mark = self.revid_to_mark[revid]
657
647
            except KeyError: