/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

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
 
17
19
import subprocess
18
20
import tempfile
19
21
 
78
80
 
79
81
        # We must use StringIO.StringIO because we want a Unicode string that
80
82
        # we can pass to send_email and have that do the proper encoding.
81
 
        from io import StringIO
 
83
        from ...sixish import StringIO
82
84
        outf = StringIO()
83
85
 
84
86
        _body = self.config.get('post_commit_body')
135
137
 
136
138
        # We can use a StringIO because show_diff_trees should only write
137
139
        # 8-bit strings. It is an error to write a Unicode string here.
138
 
        from io import StringIO
 
140
        from ...sixish import StringIO
139
141
        diff_content = StringIO()
140
142
        diff_options = self.config.get('post_commit_diffoptions')
141
143
        show_diff_trees(tree_old, tree_new, diff_content, None, diff_options)