← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/doc_generate/autodoc_rstx.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/doc_generate/autodoc_rstx.py
20
20
Written by the Bazaar community.
21
21
"""
22
22
 
23
 
import os
24
 
import sys
 
23
from __future__ import absolute_import
 
24
 
25
25
import time
26
26
 
27
27
import bzrlib
131
131
    topic_id = "%s-%s" % (topic, "help")
132
132
    filename = bzrlib.osutils.pathjoin(output_dir, topic_id + ".txt")
133
133
    f =  open(filename, "w")
134
 
    f.writelines(text)
 
134
    f.write(text.encode('utf-8'))
135
135
    f.close()
136
136
    return topic_id
137
137
 
144
144
..     %(bzrcmd)s help commands
145
145
..     %(bzrcmd)s help <cmd>
146
146
..
147
 
.. Generation time: %(timestamp)s
148
147
 
149
148
"""
150
149