Merge lp:~xnox/bzr/debian-patch into lp:bzr

Proposed by Dimitri John Ledkov on 2014-05-08
Status: Merged
Approved by: Richard Wilbur on 2014-05-08
Approved revision: 6597
Merged at revision: 6597
Proposed branch: lp:~xnox/bzr/debian-patch
Merge into: lp:bzr
Diff against target: 11 lines (+1/-1)
1 file modified
bzrlib/doc_generate/autodoc_rstx.py (+1/-1)
To merge this branch: bzr merge lp:~xnox/bzr/debian-patch
Reviewer Review Type Date Requested Status
Richard Wilbur 2014-05-08 Approve on 2014-05-08
Review via email: mp+218725@code.launchpad.net

Commit message

Jelmer: Don't pass blob to file.writelines(), but rather to file.write().

Description of the change

Patch by jelmer, applied in debian.

To post a comment you must log in.
Richard Wilbur (richard-wilbur) wrote :

Dmitri, Thanks for propagating Jelmer's patch from Debian upstream.
+2

review: Approve
Richard Wilbur (richard-wilbur) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/doc_generate/autodoc_rstx.py'
2--- bzrlib/doc_generate/autodoc_rstx.py 2011-12-19 13:23:58 +0000
3+++ bzrlib/doc_generate/autodoc_rstx.py 2014-05-08 01:40:33 +0000
4@@ -131,7 +131,7 @@
5 topic_id = "%s-%s" % (topic, "help")
6 filename = bzrlib.osutils.pathjoin(output_dir, topic_id + ".txt")
7 f = open(filename, "w")
8- f.writelines(text)
9+ f.write(text)
10 f.close()
11 return topic_id
12