/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/email/emailer.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/email/emailer.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from __future__ import absolute_import
18
 
 
19
17
import subprocess
20
18
import tempfile
21
19
 
80
78
 
81
79
        # We must use StringIO.StringIO because we want a Unicode string that
82
80
        # we can pass to send_email and have that do the proper encoding.
83
 
        from ...sixish import StringIO
 
81
        from io import StringIO
84
82
        outf = StringIO()
85
83
 
86
84
        _body = self.config.get('post_commit_body')
137
135
 
138
136
        # We can use a StringIO because show_diff_trees should only write
139
137
        # 8-bit strings. It is an error to write a Unicode string here.
140
 
        from ...sixish import StringIO
 
138
        from io import StringIO
141
139
        diff_content = StringIO()
142
140
        diff_options = self.config.get('post_commit_diffoptions')
143
141
        show_diff_trees(tree_old, tree_new, diff_content, None, diff_options)