/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/shelf_ui.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf_ui.py
16
16
 
17
17
from __future__ import absolute_import
18
18
 
19
 
from cStringIO import StringIO
20
19
import shutil
21
20
import sys
22
21
import tempfile
23
22
 
24
 
from breezy import (
 
23
from . import (
25
24
    builtins,
26
25
    delta,
27
26
    diff,
35
34
    ui,
36
35
    workingtree,
37
36
)
38
 
from breezy.i18n import gettext
 
37
from .i18n import gettext
 
38
from .sixish import (
 
39
    BytesIO,
 
40
    )
 
41
 
39
42
 
40
43
class UseEditor(Exception):
41
44
    """Use an editor instead of selecting hunks."""
237
240
            as removals, removals displayed as insertions).
238
241
        :return: A patches.Patch.
239
242
        """
240
 
        diff_file = StringIO()
 
243
        diff_file = BytesIO()
241
244
        if invert:
242
245
            old_tree = self.work_tree
243
246
            new_tree = self.target_tree