Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't always append output to the ReST files. Classes and Enums should just replace the existing file if there is one.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@70244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-01-02 23:40:48 +00:00
parent 611a5cb3a2
commit f13a31694d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
etgtools/sphinx_generator.py
View File

@@ -2380,7 +2380,7 @@ class XMLDocString(object):
stream.write("\n\n") stream.write("\n\n")
if not self.is_overload and write: if not self.is_overload and write:
WriteSphinxOutput(stream, self.output_file) WriteSphinxOutput(stream, self.output_file, append=True)
return stream.getvalue() return stream.getvalue()
@@ -2468,13 +2468,13 @@ class XMLDocString(object):
text_file = os.path.join(SPHINXROOT, self.output_file) text_file = os.path.join(SPHINXROOT, self.output_file)
if os.path.isfile(text_file): #if os.path.isfile(text_file):
message = '\nWARNING: Duplicated description for `%s` enumeration.\n\n' \ # message = '\nWARNING: Duplicated description for `%s` enumeration.\n\n' \
'The duplicated instance will still be written to its output ReST file but\n' \ # 'The duplicated instance will still be written to its output ReST file but\n' \
'Sphinx/Docutils will issue a warning when building the HTML docs.\n\n' # 'Sphinx/Docutils will issue a warning when building the HTML docs.\n\n'
#
duplicated = self.output_file.replace('.enumeration.txt', '') # duplicated = self.output_file.replace('.enumeration.txt', '')
print message % duplicated # print message % duplicated
if count > 0 and write: if count > 0 and write:
WriteSphinxOutput(stream, self.output_file) WriteSphinxOutput(stream, self.output_file)

10
sphinxtools/utilities.py
View File

@@ -458,7 +458,7 @@ def MakeSummary(name, item_list, template, kind):
# ----------------------------------------------------------------------- # # ----------------------------------------------------------------------- #
def WriteSphinxOutput(stream, filename): def WriteSphinxOutput(stream, filename, append=False):
""" """
Writes the text contained in the `stream` to the `filename` output file. Writes the text contained in the `stream` to the `filename` output file.
@@ -469,10 +469,10 @@ def WriteSphinxOutput(stream, filename):
text_file = os.path.join(SPHINXROOT, filename) text_file = os.path.join(SPHINXROOT, filename)
text = stream.getvalue() text = stream.getvalue()
if not os.path.isfile(text_file): mode = 'a' if append else 'w'
text = '.. include:: headings.inc\n\n' + text fid = codecs.open(text_file, mode, encoding='utf-8')
if mode == 'w':
fid = codecs.open(text_file, "a", encoding='utf-8') fid.write('.. include:: headings.inc\n\n')
fid.write(text) fid.write(text)
fid.close() fid.close()