← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Aaron Bentley
  • Date: 2007-06-22 05:52:32 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: aaron.bentley@utoronto.ca-20070622055232-3f3b0jxdj76i6vjj
Move base64-encoding into merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1172
1172
        bundle_txt = StringIO()
1173
1173
        bundle_txt.write(serializer._get_bundle_header('4alpha'))
1174
1174
        bundle_txt.write('\n')
1175
 
        bundle_txt.write(new_text.encode('bz2').encode('base-64'))
 
1175
        bundle_txt.write(new_text.encode('bz2'))
1176
1176
        bundle_txt.seek(0)
1177
1177
        bundle = read_bundle(bundle_txt)
1178
1178
        self.valid_apply_bundle(base_rev_id, bundle)
1235
1235
        line = bundle_file.readline()
1236
1236
        line = bundle_file.readline()
1237
1237
        lines = bundle_file.readlines()
1238
 
        return ''.join(lines).decode('base-64').decode('bz2')
 
1238
        return ''.join(lines).decode('bz2')
1239
1239
 
1240
1240
    def test_copy_signatures(self):
1241
1241
        tree_a = self.make_branch_and_tree('tree_a')