Bazaar

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

  1. debian-patch
  2. Merge into bzr.dev
Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Richard Wilbur
Approved revision: no longer in the source branch.
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 Approve
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.
Revision history for this message
Richard Wilbur (richard-wilbur) wrote :

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

review: Approve
Revision history for this message
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
=== modified file 'bzrlib/doc_generate/autodoc_rstx.py'
--- bzrlib/doc_generate/autodoc_rstx.py 2011-12-19 13:23:58 +0000
+++ bzrlib/doc_generate/autodoc_rstx.py 2014-05-08 01:40:33 +0000
@@ -131,7 +131,7 @@
131 topic_id = "%s-%s" % (topic, "help")131 topic_id = "%s-%s" % (topic, "help")
132 filename = bzrlib.osutils.pathjoin(output_dir, topic_id + ".txt")132 filename = bzrlib.osutils.pathjoin(output_dir, topic_id + ".txt")
133 f = open(filename, "w")133 f = open(filename, "w")
134 f.writelines(text)134 f.write(text)
135 f.close()135 f.close()
136 return topic_id136 return topic_id
137137