/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: Jelmer Vernooij
  • Date: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/email/emailer.py
80
80
 
81
81
        # We must use StringIO.StringIO because we want a Unicode string that
82
82
        # we can pass to send_email and have that do the proper encoding.
83
 
        from ...sixish import StringIO
 
83
        from io import StringIO
84
84
        outf = StringIO()
85
85
 
86
86
        _body = self.config.get('post_commit_body')
137
137
 
138
138
        # We can use a StringIO because show_diff_trees should only write
139
139
        # 8-bit strings. It is an error to write a Unicode string here.
140
 
        from ...sixish import StringIO
 
140
        from io import StringIO
141
141
        diff_content = StringIO()
142
142
        diff_options = self.config.get('post_commit_diffoptions')
143
143
        show_diff_trees(tree_old, tree_new, diff_content, None, diff_options)