happydoc-checkins Mailing List for HappyDoc
Brought to you by:
doughellmann,
krlosaqp
You can subscribe to this list here.
2002 |
Jan
(3) |
Feb
(40) |
Mar
(1) |
Apr
|
May
(12) |
Jun
(4) |
Jul
|
Aug
(39) |
Sep
|
Oct
(4) |
Nov
(49) |
Dec
(78) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(54) |
Feb
|
Mar
(41) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2006 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(13) |
From: Doug H. <dou...@us...> - 2006-12-05 13:43:30
|
Update of /cvsroot/happydoc/HappyDoc3 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17448 Modified Files: Package.mak Log Message: There is no need to include docs for the tests in the output Index: Package.mak =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/Package.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Package.mak 15 Mar 2003 14:25:10 -0000 1.1 --- Package.mak 5 Dec 2006 13:43:27 -0000 1.2 *************** *** 200,203 **** --- 200,204 ---- $(HAPPYDOC) \ -d $(DOC_OUTPUT_DIR) \ + -i TestCase -i TestCases \ -t "$(PRODUCT_NAME) Source Documentation" \ $(HDSILENT) \ |
From: Doug H. <dou...@us...> - 2006-12-05 13:22:16
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docstring In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8334/happydoclib/docstring Added Files: test_docstring_StructuredText.py Log Message: Move tests out of docstring_StructuredText.py --- NEW FILE: test_docstring_StructuredText.py --- #!/usr/bin/env python # # $Id: test_docstring_StructuredText.py,v 1.1 2006/12/05 13:22:12 doughellmann Exp $ # # Copyright 2001 Doug Hellmann. # # # All Rights Reserved # # Permission to use, copy, modify, and distribute this software and # its documentation for any purpose and without fee is hereby # granted, provided that the above copyright notice appear in all # copies and that both that copyright notice and this permission # notice appear in supporting documentation, and that the name of Doug # Hellmann not be used in advertising or publicity pertaining to # distribution of the software without specific, written prior # permission. # # DOUG HELLMANN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN # NO EVENT SHALL DOUG HELLMANN BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS # OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # """Docstring converter for StructuredText format. """ __rcs_info__ = { # # Creation Information # 'module_name' : '$RCSfile: test_docstring_StructuredText.py,v $', 'rcs_id' : '$Id: test_docstring_StructuredText.py,v 1.1 2006/12/05 13:22:12 doughellmann Exp $', 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', # # Current Information # 'author' : '$Author: doughellmann $', 'version' : '$Revision: 1.1 $', 'date' : '$Date: 2006/12/05 13:22:12 $', } try: __version__ = __rcs_info__['version'].split(' ')[1] except: __version__ = '0.0' # # Import system modules # # # Import Local modules # import happydoclib.docstring.StructuredText import happydoclib class StructuredTextUnitTest(happydoclib.happydocstring.DocStringConverterTest): html_quote_text = '<>&"\'[]{};' html_quote_expected_text = "<>&"'[]{};" st_test_text_with_links = ''' Structured Text With Links This "link":link.html points to link.html. This [1] reference points to an internal reference. .. [1] This is the internal reference. ''' st_expected_text_with_links = ''' <h3> Structured Text With Links</h3> <p> This <a href="link.html">link</a> points to link.html.</p> <p> This <a href="#1"><a href="#ref1">[1]</a></a> reference points to an internal reference.</p> <p> <a name="1"><a href="#ref1">[1]</a></a> This is the internal reference.</p> ''' st_test_text = '''Structured Text Manipulation Parse a structured text string into a form that can be used with structured formats, like html. Structured text is text that uses indentation and simple symbology to indicate the structure of a document. A structured string consists of a sequence of paragraphs separated by one or more blank lines. Each paragraph has a level which is defined as the minimum indentation of the paragraph. A paragraph is a sub-paragraph of another paragraph if the other paragraph is the last preceding paragraph that has a lower level. Special symbology is used to indicate special constructs: - A single-line paragraph whose immediately succeeding paragraphs are lower level is treated as a header. - A paragraph that begins with a '-', '*', or 'o' is treated as an unordered list (bullet) element. - A paragraph that begins with a sequence of digits followed by a white-space character is treated as an ordered list element. - A paragraph that begins with a sequence of sequences, where each sequence is a sequence of digits or a sequence of letters followed by a period, is treated as an ordered list element. - A paragraph with a first line that contains some text, followed by some white-space and '--' is treated as a descriptive list element. The leading text is treated as the element title. - Sub-paragraphs of a paragraph that ends in the word 'example' or the word 'examples', or '::' is treated as example code and is output as is. - Text enclosed single quotes (with white-space to the left of the first quote and whitespace or puctuation to the right of the second quote) is treated as example code. - Text surrounded by '*' characters (with white-space to the left of the first '*' and whitespace or puctuation to the right of the second '*') is emphasized. - Text surrounded by '**' characters (with white-space to the left of the first '**' and whitespace or puctuation to the right of the second '**') is made strong. - Text surrounded by '_' underscore characters (with whitespace to the left and whitespace or punctuation to the right) is made underlined. - Text encloded by double quotes followed by a colon, a URL, and concluded by punctuation plus white space, *or* just white space, is treated as a hyper link. For example: "Zope":http://www.zope.org/ is ... Is interpreted as '<a href="http://www.zope.org/">Zope</a> is ....' Note: This works for relative as well as absolute URLs. - Text enclosed by double quotes followed by a comma, one or more spaces, an absolute URL and concluded by punctuation plus white space, or just white space, is treated as a hyper link. For example: "mail me", mailto:am...@di.... Is interpreted as '<a href="mailto:am...@di...">mail me</a>.' - Text enclosed in brackets which consists only of letters, digits, underscores and dashes is treated as hyper links within the document. For example: As demonstrated by Smith [12] this technique is quite effective. Is interpreted as '... by Smith <a href="#12">[12]</a> this ...'. Together with the next rule this allows easy coding of references or end notes. - Text enclosed in brackets which is preceded by the start of a line, two periods and a space is treated as a named link. For example: .. [12] "Effective Techniques" Smith, Joe ... Is interpreted as '<a name="12">[12]</a> "Effective Techniques" ...'. Together with the previous rule this allows easy coding of references or end notes. - A paragraph that has blocks of text enclosed in '||' is treated as a table. The text blocks correspond to table cells and table rows are denoted by newlines. By default the cells are center aligned. A cell can span more than one column by preceding a block of text with an equivalent number of cell separators '||'. Newlines and '|' cannot be a part of the cell text. For example: |||| **Ingredients** || || *Name* || *Amount* || ||Spam||10|| ||Eggs||3|| is interpreted as:: <TABLE BORDER=1 CELLPADDING=2> <TR> <TD ALIGN=CENTER COLSPAN=2> <strong>Ingredients</strong> </TD> </TR> <TR> <TD ALIGN=CENTER COLSPAN=1> <em>Name</em> </TD> <TD ALIGN=CENTER COLSPAN=1> <em>Amount</em> </TD> </TR> <TR> <TD ALIGN=CENTER COLSPAN=1>Spam</TD> <TD ALIGN=CENTER COLSPAN=1>10</TD> </TR> <TR> <TD ALIGN=CENTER COLSPAN=1>Eggs</TD> <TD ALIGN=CENTER COLSPAN=1>3</TD> </TR> </TABLE>''' st_expected_text = ''' <p>Structured Text Manipulation</p> <p>Parse a structured text string into a form that can be used with structured formats, like html.</p> <p>Structured text is text that uses indentation and simple symbology to indicate the structure of a document. </p> <p>A structured string consists of a sequence of paragraphs separated by one or more blank lines. Each paragraph has a level which is defined as the minimum indentation of the paragraph. A paragraph is a sub-paragraph of another paragraph if the other paragraph is the last preceding paragraph that has a lower level.</p> <p>Special symbology is used to indicate special constructs:</p> <ul> <li>A single-line paragraph whose immediately succeeding paragraphs are lower level is treated as a header.</li> <li>A paragraph that begins with a '-', <code>*</code>, or <code>o</code> is treated as an unordered list (bullet) element.</li> <li>A paragraph that begins with a sequence of digits followed by a white-space character is treated as an ordered list element.</li> <li>A paragraph that begins with a sequence of sequences, where each sequence is a sequence of digits or a sequence of letters followed by a period, is treated as an ordered list element.</li> <li>A paragraph with a first line that contains some text, followed by some white-space and <code>--</code> is treated as a descriptive list element. The leading text is treated as the element title.</li> <li>Sub-paragraphs of a paragraph that ends in the word <code>example</code> or the word <code>examples</code>, or <code>::</code> is treated as example code and is output as is.</li> <li>Text enclosed single quotes (with white-space to the left of the first quote and whitespace or puctuation to the right of the second quote) is treated as example code.</li> <li>Text surrounded by <code>*</code> characters (with white-space to the left of the first <code>*</code> and whitespace or puctuation to the right of the second <code>*</code>) is emphasized.</li> <li>Text surrounded by <code>**</code> characters (with white-space to the left of the first <code>**</code> and whitespace or puctuation to the right of the second <code>**</code>) is made strong.</li> <li>Text surrounded by <code>_</code> underscore characters (with whitespace to the left and whitespace or punctuation to the right) is made underlined.</li> <li>Text encloded by double quotes followed by a colon, a URL, and concluded by punctuation plus white space, <em>or</em> just white space, is treated as a hyper link. For example:<p> <a href="http://www.zope.org/">Zope</a> is ...</p> <p> Is interpreted as '<a href="http://www.zope.org/">Zope</a> is ....' Note: This works for relative as well as absolute URLs.</p> </li> <li>Text enclosed by double quotes followed by a comma, one or more spaces, an absolute URL and concluded by punctuation plus white space, or just white space, is treated as a hyper link. For example: <p> <a href="mailto:am...@di...">mail me</a>.</p> <p> Is interpreted as '<a href="mailto:am...@di...">mail me</a>.' </p> </li> <li>Text enclosed in brackets which consists only of letters, digits, underscores and dashes is treated as hyper links within the document. For example:<p> As demonstrated by Smith <a href="#12"><a href="#ref12">[12]</a></a> this technique is quite effective.</p> <p> Is interpreted as '... by Smith <a href="#12"><a href="#ref12">[12]</a></a> this ...'. Together with the next rule this allows easy coding of references or end notes.</p> </li> <li>Text enclosed in brackets which is preceded by the start of a line, two periods and a space is treated as a named link. For example:<p> .. <a href="#12"><a href="#ref12">[12]</a></a> "Effective Techniques" Smith, Joe ... </p> <p> Is interpreted as '<a name="12"><a href="#ref12">[12]</a></a> "Effective Techniques" ...'. Together with the previous rule this allows easy coding of references or end notes. </p> </li> <li>A paragraph that has blocks of text enclosed in <code>||</code> is treated as a table. The text blocks correspond to table cells and table rows are denoted by newlines. By default the cells are center aligned. A cell can span more than one column by preceding a block of text with an equivalent number of cell separators <code>||</code>. Newlines and <code>|</code> cannot be a part of the cell text. For example:<p> |||| <strong>Ingredients</strong> || || <em>Name</em> || <em>Amount</em> || ||Spam||10|| ||Eggs||3||</p> <p> is interpreted as: <pre> <TABLE BORDER=1 CELLPADDING=2> <TR> <TD ALIGN=CENTER COLSPAN=2> <strong>Ingredients</strong> </TD> </TR> <TR> <TD ALIGN=CENTER COLSPAN=1> <em>Name</em> </TD> <TD ALIGN=CENTER COLSPAN=1> <em>Amount</em> </TD> </TR> <TR> <TD ALIGN=CENTER COLSPAN=1>Spam</TD> <TD ALIGN=CENTER COLSPAN=1>10</TD> </TR> <TR> <TD ALIGN=CENTER COLSPAN=1>Eggs</TD> <TD ALIGN=CENTER COLSPAN=1>3</TD> </TR> </TABLE> </pre> </p> </li> </ul> ''' def testConvertStructuredTextToHTML(self): self._testConversion( self.st_test_text, 'StructuredText', 'html', self.st_expected_text, 'StructuredText-to-HTML conversion failed.' ) return def testConvertStructuredTextToHTMLWithLinks(self): self._testConversion( self.st_test_text_with_links, 'StructuredText', 'html', self.st_expected_text_with_links, 'StructuredText-to-HTML-with-links conversion failed.', ) return def testQuoteStructuredTextToHTML(self): self._testQuote(self.html_quote_text, 'StructuredText', 'html', self.html_quote_expected_text, 'ST-to-HTML quote failed.', ) return def testStructuredTextOneLiner(self): stf = StructuredTextFile(filename='internal', body=self.st_test_text) assert stf, 'Unable to create valid StructuredTextFile' expected_oneliner = 'Structured Text Manipulation' assert stf.oneLiner() == expected_oneliner, 'Got different one-liner "%s"' % stf.oneLiner() return def testBug594026(self): input_text = '*marié* or **marié**' expected_text = ''' <p><em>marié</em> or <strong>marié</strong></p> ''' self._testConversion(input_text, 'StructuredText', 'html', expected_text, 'StructuredText-to-HTML with accented characters failed.', ) return def testBug471981(self): input_text1 = """ any text first heading first section second heading second section third heading third section """ expected_text1 = ''' <h3> any text</h3> <p> first section</p> <h3>first heading</h3> <p> second section</p> <h3>second heading</h3> <p> third section</p> <p>third heading</p> ''' self._testConversion( input_text1, 'StructuredText', 'html', expected_text1, 'Converting Classic ST to HTML did not produce expected results.', ) input_text2 = """ first heading first section second heading second section third heading third section """ expected_text2 = ''' <h3>first heading</h3> <p> first section</p> <h3>second heading</h3> <p> second section</p> <h3>third heading</h3> <p> third section</p> ''' self._testConversion( input_text2, 'StructuredText', 'html', expected_text2, 'Converting Classic ST to HTML did not produce expected results.', ) return def testWithQuotableCharacters(self): input_text = "Here are some quotable characters. & < > < >." expected_text = '\n<p>Here are some quotable characters. & < > < >.</p>\n' self._testConversion( input_text, 'StructuredText', 'html', expected_text, 'Converting ST to HTML with quotable characters did not produce expected results.', ) def testWithQuotableCharactersInExample(self): input_text = """Here are some quotable characters in example paragraphs First, a true example:: Begin & < > Finally, embedded in a code segment '& < >'. """ expected_text = """ <h3>Here are some quotable characters in example paragraphs</h3> <p> First, a true example: <pre> Begin & < > </pre> </p> <p> Finally, embedded in a code segment '& < >'.</p> """ self._testConversion( input_text, 'StructuredText', 'html', expected_text, 'Converting ST to HTML with quotable characters did not produce expected results.', ) |
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docstring In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/happydoclib/docstring Modified Files: __init__.py docstring_ClassicStructuredText.py docstring_PlainText.py docstring_RawText.py docstring_StructuredText.py Log Message: Fix file headers Index: __init__.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/__init__.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** __init__.py 17 Nov 2002 00:26:19 -0000 1.1.1.1 --- __init__.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 70,74 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <Dou...@bi...>', 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:31:19 EDT', --- 70,74 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:31:19 EDT', Index: docstring_ClassicStructuredText.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/docstring_ClassicStructuredText.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** docstring_ClassicStructuredText.py 19 Jan 2003 22:03:44 -0000 1.3 --- docstring_ClassicStructuredText.py 5 Dec 2006 13:10:46 -0000 1.4 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <Dou...@bi...>', 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', Index: docstring_PlainText.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/docstring_PlainText.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** docstring_PlainText.py 17 Nov 2002 00:26:19 -0000 1.1.1.1 --- docstring_PlainText.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 40,45 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', --- 40,45 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', Index: docstring_RawText.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/docstring_RawText.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** docstring_RawText.py 19 Jan 2003 22:04:06 -0000 1.2 --- docstring_RawText.py 5 Dec 2006 13:10:46 -0000 1.3 *************** *** 37,42 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', --- 37,42 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', Index: docstring_StructuredText.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/docstring_StructuredText.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** docstring_StructuredText.py 1 Jan 2003 14:06:38 -0000 1.2 --- docstring_StructuredText.py 5 Dec 2006 13:10:46 -0000 1.3 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <Dou...@bi...>', 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:52:01 EDT', *************** *** 297,700 **** return inputText - - class StructuredTextUnitTest(happydoclib.happydocstring.DocStringConverterTest): - - html_quote_text = '<>&"\'[]{};' - html_quote_expected_text = "<>&"'[]{};" - - st_test_text_with_links = ''' - Structured Text With Links - - This "link":link.html points to link.html. - - This [1] reference points to an internal reference. - - .. [1] This is the internal reference. - ''' - - st_expected_text_with_links = ''' - <h3> Structured Text With Links</h3> - <p> This <a href="link.html">link</a> points to link.html.</p> - <p> This <a href="#1"><a href="#ref1">[1]</a></a> reference points to an internal reference.</p> - <p> <a name="1"><a href="#ref1">[1]</a></a> This is the internal reference.</p> - ''' - - st_test_text = '''Structured Text Manipulation - - Parse a structured text string into a form that can be used with - structured formats, like html. - - Structured text is text that uses indentation and simple - symbology to indicate the structure of a document. - - A structured string consists of a sequence of paragraphs separated by - one or more blank lines. Each paragraph has a level which is defined - as the minimum indentation of the paragraph. A paragraph is a - sub-paragraph of another paragraph if the other paragraph is the last - preceding paragraph that has a lower level. - - Special symbology is used to indicate special constructs: - - - A single-line paragraph whose immediately succeeding paragraphs are lower - level is treated as a header. - - - A paragraph that begins with a '-', '*', or 'o' is treated as an - unordered list (bullet) element. - - - A paragraph that begins with a sequence of digits followed by a - white-space character is treated as an ordered list element. - - - A paragraph that begins with a sequence of sequences, where each - sequence is a sequence of digits or a sequence of letters followed - by a period, is treated as an ordered list element. - - - A paragraph with a first line that contains some text, followed by - some white-space and '--' is treated as - a descriptive list element. The leading text is treated as the - element title. - - - Sub-paragraphs of a paragraph that ends in the word 'example' or the - word 'examples', or '::' is treated as example code and is output as is. - - - Text enclosed single quotes (with white-space to the left of the - first quote and whitespace or puctuation to the right of the second quote) - is treated as example code. - - - Text surrounded by '*' characters (with white-space to the left of the - first '*' and whitespace or puctuation to the right of the second '*') - is emphasized. - - - Text surrounded by '**' characters (with white-space to the left of the - first '**' and whitespace or puctuation to the right of the second '**') - is made strong. - - - Text surrounded by '_' underscore characters (with whitespace to the left - and whitespace or punctuation to the right) is made underlined. - - - Text encloded by double quotes followed by a colon, a URL, and concluded - by punctuation plus white space, *or* just white space, is treated as a - hyper link. For example: - - "Zope":http://www.zope.org/ is ... - - Is interpreted as '<a href="http://www.zope.org/">Zope</a> is ....' - Note: This works for relative as well as absolute URLs. - - - Text enclosed by double quotes followed by a comma, one or more spaces, - an absolute URL and concluded by punctuation plus white space, or just - white space, is treated as a hyper link. For example: - - "mail me", mailto:am...@di.... - - Is interpreted as '<a href="mailto:am...@di...">mail me</a>.' - - - Text enclosed in brackets which consists only of letters, digits, - underscores and dashes is treated as hyper links within the document. - For example: - - As demonstrated by Smith [12] this technique is quite effective. - - Is interpreted as '... by Smith <a href="#12">[12]</a> this ...'. Together - with the next rule this allows easy coding of references or end notes. - - - Text enclosed in brackets which is preceded by the start of a line, two - periods and a space is treated as a named link. For example: - - .. [12] "Effective Techniques" Smith, Joe ... - - Is interpreted as '<a name="12">[12]</a> "Effective Techniques" ...'. - Together with the previous rule this allows easy coding of references or - end notes. - - - - A paragraph that has blocks of text enclosed in '||' is treated as a - table. The text blocks correspond to table cells and table rows are - denoted by newlines. By default the cells are center aligned. A cell - can span more than one column by preceding a block of text with an - equivalent number of cell separators '||'. Newlines and '|' cannot - be a part of the cell text. For example: - - |||| **Ingredients** || - || *Name* || *Amount* || - ||Spam||10|| - ||Eggs||3|| - - is interpreted as:: - - <TABLE BORDER=1 CELLPADDING=2> - <TR> - <TD ALIGN=CENTER COLSPAN=2> <strong>Ingredients</strong> </TD> - </TR> - <TR> - <TD ALIGN=CENTER COLSPAN=1> <em>Name</em> </TD> - <TD ALIGN=CENTER COLSPAN=1> <em>Amount</em> </TD> - </TR> - <TR> - <TD ALIGN=CENTER COLSPAN=1>Spam</TD> - <TD ALIGN=CENTER COLSPAN=1>10</TD> - </TR> - <TR> - <TD ALIGN=CENTER COLSPAN=1>Eggs</TD> - <TD ALIGN=CENTER COLSPAN=1>3</TD> - </TR> - </TABLE>''' - - st_expected_text = ''' - <p>Structured Text Manipulation</p> - <p>Parse a structured text string into a form that can be used with - structured formats, like html.</p> - <p>Structured text is text that uses indentation and simple - symbology to indicate the structure of a document. </p> - <p>A structured string consists of a sequence of paragraphs separated by - one or more blank lines. Each paragraph has a level which is defined - as the minimum indentation of the paragraph. A paragraph is a - sub-paragraph of another paragraph if the other paragraph is the last - preceding paragraph that has a lower level.</p> - <p>Special symbology is used to indicate special constructs:</p> - - <ul> - <li>A single-line paragraph whose immediately succeeding paragraphs are lower - level is treated as a header.</li> - <li>A paragraph that begins with a '-', <code>*</code>, or <code>o</code> is treated as an - unordered list (bullet) element.</li> - <li>A paragraph that begins with a sequence of digits followed by a - white-space character is treated as an ordered list element.</li> - <li>A paragraph that begins with a sequence of sequences, where each - sequence is a sequence of digits or a sequence of letters followed - by a period, is treated as an ordered list element.</li> - <li>A paragraph with a first line that contains some text, followed by - some white-space and <code>--</code> is treated as - a descriptive list element. The leading text is treated as the - element title.</li> - <li>Sub-paragraphs of a paragraph that ends in the word <code>example</code> or the - word <code>examples</code>, or <code>::</code> is treated as example code and is output as is.</li> - <li>Text enclosed single quotes (with white-space to the left of the - first quote and whitespace or puctuation to the right of the second quote) - is treated as example code.</li> - <li>Text surrounded by <code>*</code> characters (with white-space to the left of the - first <code>*</code> and whitespace or puctuation to the right of the second <code>*</code>) - is emphasized.</li> - <li>Text surrounded by <code>**</code> characters (with white-space to the left of the - first <code>**</code> and whitespace or puctuation to the right of the second <code>**</code>) - is made strong.</li> - <li>Text surrounded by <code>_</code> underscore characters (with whitespace to the left - and whitespace or punctuation to the right) is made underlined.</li> - <li>Text encloded by double quotes followed by a colon, a URL, and concluded - by punctuation plus white space, <em>or</em> just white space, is treated as a - hyper link. For example:<p> <a href="http://www.zope.org/">Zope</a> is ...</p> - <p> Is interpreted as '<a href="http://www.zope.org/">Zope</a> is ....' - Note: This works for relative as well as absolute URLs.</p> - </li> - <li>Text enclosed by double quotes followed by a comma, one or more spaces, - an absolute URL and concluded by punctuation plus white space, or just - white space, is treated as a hyper link. For example: <p> <a href="mailto:am...@di...">mail me</a>.</p> - <p> Is interpreted as '<a href="mailto:am...@di...">mail me</a>.' </p> - </li> - <li>Text enclosed in brackets which consists only of letters, digits, - underscores and dashes is treated as hyper links within the document. - For example:<p> As demonstrated by Smith <a href="#12"><a href="#ref12">[12]</a></a> this technique is quite effective.</p> - <p> Is interpreted as '... by Smith <a href="#12"><a href="#ref12">[12]</a></a> this ...'. Together - with the next rule this allows easy coding of references or end notes.</p> - </li> - <li>Text enclosed in brackets which is preceded by the start of a line, two - periods and a space is treated as a named link. For example:<p> .. <a href="#12"><a href="#ref12">[12]</a></a> "Effective Techniques" Smith, Joe ... </p> - <p> Is interpreted as '<a name="12"><a href="#ref12">[12]</a></a> "Effective Techniques" ...'. - Together with the previous rule this allows easy coding of references or - end notes. </p> - </li> - <li>A paragraph that has blocks of text enclosed in <code>||</code> is treated as a - table. The text blocks correspond to table cells and table rows are - denoted by newlines. By default the cells are center aligned. A cell - can span more than one column by preceding a block of text with an - equivalent number of cell separators <code>||</code>. Newlines and <code>|</code> cannot - be a part of the cell text. For example:<p> |||| <strong>Ingredients</strong> || - || <em>Name</em> || <em>Amount</em> || - ||Spam||10|| - ||Eggs||3||</p> - <p> is interpreted as: - <pre> - <TABLE BORDER=1 CELLPADDING=2> - <TR> - <TD ALIGN=CENTER COLSPAN=2> <strong>Ingredients</strong> </TD> - </TR> - <TR> - <TD ALIGN=CENTER COLSPAN=1> <em>Name</em> </TD> - <TD ALIGN=CENTER COLSPAN=1> <em>Amount</em> </TD> - </TR> - <TR> - <TD ALIGN=CENTER COLSPAN=1>Spam</TD> - <TD ALIGN=CENTER COLSPAN=1>10</TD> - </TR> - <TR> - <TD ALIGN=CENTER COLSPAN=1>Eggs</TD> - <TD ALIGN=CENTER COLSPAN=1>3</TD> - </TR> - </TABLE> - </pre> - </p> - </li> - - </ul> - ''' - - - def testConvertStructuredTextToHTML(self): - self._testConversion( self.st_test_text, 'StructuredText', - 'html', self.st_expected_text, - 'StructuredText-to-HTML conversion failed.' - ) - return - - def testConvertStructuredTextToHTMLWithLinks(self): - self._testConversion( self.st_test_text_with_links, 'StructuredText', - 'html', self.st_expected_text_with_links, - 'StructuredText-to-HTML-with-links conversion failed.', - ) - return - - def testQuoteStructuredTextToHTML(self): - self._testQuote(self.html_quote_text, 'StructuredText', 'html', - self.html_quote_expected_text, - 'ST-to-HTML quote failed.', - ) - return - - def testStructuredTextOneLiner(self): - stf = StructuredTextFile(filename='internal', body=self.st_test_text) - assert stf, 'Unable to create valid StructuredTextFile' - expected_oneliner = 'Structured Text Manipulation' - assert stf.oneLiner() == expected_oneliner, 'Got different one-liner "%s"' % stf.oneLiner() - return - - def testBug594026(self): - input_text = '*marié* or **marié**' - expected_text = ''' - <p><em>marié</em> or <strong>marié</strong></p> - ''' - self._testConversion(input_text, - 'StructuredText', - 'html', - expected_text, - 'StructuredText-to-HTML with accented characters failed.', - ) - return - - - def testBug471981(self): - input_text1 = """ any text - - first heading - - first - section - - second heading - - second - section - - third heading - - third - section - """ - expected_text1 = ''' - <h3> any text</h3> - <p> first - section</p> - <h3>first heading</h3> - <p> second - section</p> - <h3>second heading</h3> - <p> third - section</p> - <p>third heading</p> - ''' - - self._testConversion( - input_text1, - 'StructuredText', - 'html', - expected_text1, - 'Converting Classic ST to HTML did not produce expected results.', - ) - - input_text2 = """ - - first heading - - first - section - - second heading - - second - section - - third heading - - third - section - """ - expected_text2 = ''' - <h3>first heading</h3> - <p> first - section</p> - <h3>second heading</h3> - <p> second - section</p> - <h3>third heading</h3> - <p> third - section</p> - ''' - - self._testConversion( - input_text2, - 'StructuredText', - 'html', - expected_text2, - 'Converting Classic ST to HTML did not produce expected results.', - ) - return - - - def testWithQuotableCharacters(self): - input_text = "Here are some quotable characters. & < > < >." - expected_text = '\n<p>Here are some quotable characters. & < > < >.</p>\n' - - self._testConversion( - input_text, - 'StructuredText', - 'html', - expected_text, - 'Converting ST to HTML with quotable characters did not produce expected results.', - ) - - - def testWithQuotableCharactersInExample(self): - input_text = """Here are some quotable characters in example paragraphs - - First, a true example:: - - Begin & < > - - Finally, embedded in a code segment '& < >'. - """ - expected_text = """ - <h3>Here are some quotable characters in example paragraphs</h3> - <p> First, a true example: - <pre> - Begin & < > - </pre> - </p> - <p> Finally, embedded in a code segment '& < >'.</p> - """ - - self._testConversion( - input_text, - 'StructuredText', - 'html', - expected_text, - 'Converting ST to HTML with quotable characters did not produce expected results.', - ) - --- 297,298 ---- |
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/parsers In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/happydoclib/parsers Modified Files: __init__.py base.py parsers_default.py parsers_directory.py parsers_python.py parsers_structuredtext.py parsers_text.py Log Message: Fix file headers Index: __init__.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parsers/__init__.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** __init__.py 18 Jan 2003 20:01:52 -0000 1.1 --- __init__.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 11:53:33 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 11:53:33 EST', Index: base.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parsers/base.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** base.py 18 Jan 2003 20:01:52 -0000 1.1 --- base.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:03:15 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:03:15 EST', Index: parsers_default.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parsers/parsers_default.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** parsers_default.py 18 Jan 2003 20:01:52 -0000 1.1 --- parsers_default.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:03:15 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:03:15 EST', Index: parsers_directory.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parsers/parsers_directory.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** parsers_directory.py 18 Jan 2003 20:01:52 -0000 1.1 --- parsers_directory.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:03:15 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:03:15 EST', Index: parsers_python.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parsers/parsers_python.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** parsers_python.py 16 Mar 2003 23:45:40 -0000 1.2 --- parsers_python.py 5 Dec 2006 13:10:46 -0000 1.3 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:07:52 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:07:52 EST', Index: parsers_structuredtext.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parsers/parsers_structuredtext.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** parsers_structuredtext.py 18 Jan 2003 20:01:51 -0000 1.1 --- parsers_structuredtext.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:07:52 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:07:52 EST', Index: parsers_text.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parsers/parsers_text.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** parsers_text.py 18 Jan 2003 22:15:34 -0000 1.2 --- parsers_text.py 5 Dec 2006 13:10:46 -0000 1.3 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:28:46 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 12:28:46 EST', |
Update of /cvsroot/happydoc/HappyDoc3/happydoclib In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/happydoclib Modified Files: CommandLineApp.py __init__.py appclass.py cvsignore.py cvsversion.py happydocstring.py optiontools.py packagetree.py pluginloader.py scanner.py status.py sysmodules.py test_cvsignore.py test_packagetree.py test_scanner.py tests.py trace.py utils.py Log Message: Fix file headers Index: CommandLineApp.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/CommandLineApp.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CommandLineApp.py 17 Nov 2002 00:26:14 -0000 1.1.1.1 --- CommandLineApp.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 47,51 **** # 'module_name':'$RCSfile$', ! 'creator':'Doug Hellmann <do...@he...>', 'project':'Open Source', 'created':'Tue, 23-May-2000 07:11:43 EDT', --- 47,51 ---- # 'module_name':'$RCSfile$', ! 'creator':'Doug Hellmann', 'project':'Open Source', 'created':'Tue, 23-May-2000 07:11:43 EDT', Index: __init__.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/__init__.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** __init__.py 18 Nov 2002 13:39:25 -0000 1.3 --- __init__.py 5 Dec 2006 13:10:45 -0000 1.4 *************** *** 38,42 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 21-Oct-2001 17:34:58 EDT', --- 38,42 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 21-Oct-2001 17:34:58 EDT', Index: appclass.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/appclass.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** appclass.py 16 Apr 2006 23:21:11 -0000 1.16 --- appclass.py 5 Dec 2006 13:10:45 -0000 1.17 *************** *** 35,39 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 13-Aug-2000 11:27:00 EDT', --- 35,39 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 13-Aug-2000 11:27:00 EDT', *************** *** 92,96 **** output_directory = './doc' output = None ! author_name = 'Doug Hellmann <do...@he...>' app_home = 'http://HappyDoc.sourceforge.net/' package_description_file = 'README.txt' --- 92,96 ---- output_directory = './doc' output = None ! author_name = 'Doug Hellmann' app_home = 'http://HappyDoc.sourceforge.net/' package_description_file = 'README.txt' Index: cvsignore.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/cvsignore.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cvsignore.py 18 Jan 2003 14:15:29 -0000 1.1 --- cvsignore.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 08:29:30 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 08:29:30 EST', Index: cvsversion.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/cvsversion.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cvsversion.py 17 Nov 2002 00:26:19 -0000 1.1.1.1 --- cvsversion.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 3,7 **** # $Id$ # ! # Time-stamp: <01/10/21 17:48:48 dhellmann> # # Copyright 2001 Doug Hellmann. --- 3,7 ---- # $Id$ # ! # Time-stamp: <06/12/05 07:57:00 dhellmann> # # Copyright 2001 Doug Hellmann. *************** *** 38,42 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <Dou...@bi...>', 'project' : 'HappyDoc', 'created' : 'Sat, 03-Feb-2001 12:48:26 EST', --- 38,42 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 03-Feb-2001 12:48:26 EST', Index: happydocstring.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/happydocstring.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** happydocstring.py 17 Nov 2002 15:01:36 -0000 1.2 --- happydocstring.py 5 Dec 2006 13:10:45 -0000 1.3 *************** *** 41,46 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Wed, 26-Sep-2001 09:41:36 EDT', --- 41,46 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Wed, 26-Sep-2001 09:41:36 EDT', Index: optiontools.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/optiontools.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** optiontools.py 17 Nov 2002 00:26:19 -0000 1.1.1.1 --- optiontools.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 3,7 **** # $Id$ # ! # Time-stamp: <02/11/16 17:26:25 dhellmann> # # Copyright 2001 Doug Hellmann --- 3,7 ---- # $Id$ # ! # Time-stamp: <06/12/05 07:57:20 dhellmann> # # Copyright 2001 Doug Hellmann *************** *** 37,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <Dou...@bi...>', 'project' : 'HappyDoc', 'created' : 'Sat, 03-Feb-2001 09:55:18 EST', --- 37,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 03-Feb-2001 09:55:18 EST', Index: packagetree.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/packagetree.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** packagetree.py 18 Mar 2003 17:21:52 -0000 1.10 --- packagetree.py 5 Dec 2006 13:10:45 -0000 1.11 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 29-Dec-2002 12:37:53 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 29-Dec-2002 12:37:53 EST', Index: pluginloader.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/pluginloader.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pluginloader.py 18 Jan 2003 19:56:24 -0000 1.5 --- pluginloader.py 5 Dec 2006 13:10:45 -0000 1.6 *************** *** 33,37 **** # 'module_name':'$RCSfile$', ! 'creator':'Doug Hellmann <do...@he...>', 'project':'HappyDoc', 'created':'Sat, 03-Jun-2000 19:23:48 EDT', --- 33,37 ---- # 'module_name':'$RCSfile$', ! 'creator':'Doug Hellmann', 'project':'HappyDoc', 'created':'Sat, 03-Jun-2000 19:23:48 EDT', Index: scanner.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/scanner.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** scanner.py 18 Jan 2003 20:01:02 -0000 1.18 --- scanner.py 5 Dec 2006 13:10:45 -0000 1.19 *************** *** 39,43 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 16-Nov-2002 17:38:31 EST', --- 39,43 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 16-Nov-2002 17:38:31 EST', Index: status.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/status.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** status.py 1 Dec 2002 22:35:53 -0000 1.1 --- status.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 1,6 **** # # $Id$ # ! # Copyright 2002 Racemi, Inc. # --- 1,27 ---- + #!/usr/bin/env python # # $Id$ # ! # Copyright 2006 Doug Hellmann. ! # ! # ! # All Rights Reserved ! # ! # Permission to use, copy, modify, and distribute this software and ! # its documentation for any purpose and without fee is hereby ! # granted, provided that the above copyright notice appear in all ! # copies and that both that copyright notice and this permission ! # notice appear in supporting documentation, and that the name of Doug ! # Hellmann not be used in advertising or publicity pertaining to ! # distribution of the software without specific, written prior ! # permission. ! # ! # DOUG HELLMANN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ! # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN ! # NO EVENT SHALL DOUG HELLMANN BE LIABLE FOR ANY SPECIAL, INDIRECT OR ! # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS ! # OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, ! # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ! # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # Index: sysmodules.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/sysmodules.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sysmodules.py 27 Dec 2002 18:34:36 -0000 1.1 --- sysmodules.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Fri, 27-Dec-2002 11:19:36 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Fri, 27-Dec-2002 11:19:36 EST', Index: test_cvsignore.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/test_cvsignore.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_cvsignore.py 18 Jan 2003 14:15:29 -0000 1.1 --- test_cvsignore.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 08:42:33 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 18-Jan-2003 08:42:33 EST', Index: test_packagetree.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/test_packagetree.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_packagetree.py 1 Jan 2003 13:48:47 -0000 1.2 --- test_packagetree.py 5 Dec 2006 13:10:45 -0000 1.3 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 29-Dec-2002 12:41:21 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 29-Dec-2002 12:41:21 EST', Index: test_scanner.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/test_scanner.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** test_scanner.py 1 Jan 2003 13:49:11 -0000 1.11 --- test_scanner.py 5 Dec 2006 13:10:45 -0000 1.12 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sat, 16-Nov-2002 17:45:13 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sat, 16-Nov-2002 17:45:13 EST', Index: tests.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/tests.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tests.py 16 Mar 2003 16:25:05 -0000 1.2 --- tests.py 5 Dec 2006 13:10:45 -0000 1.3 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 15-Dec-2002 09:39:20 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 15-Dec-2002 09:39:20 EST', Index: trace.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/trace.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** trace.py 17 Nov 2002 00:26:19 -0000 1.1.1.1 --- trace.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 48,53 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Mon, 29-Oct-2001 09:29:22 EST', --- 48,53 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Mon, 29-Oct-2001 09:29:22 EST', Index: utils.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/utils.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** utils.py 18 Jan 2003 19:57:33 -0000 1.3 --- utils.py 5 Dec 2006 13:10:45 -0000 1.4 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 15-Dec-2002 10:12:56 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 15-Dec-2002 10:12:56 EST', |
From: Doug H. <dou...@us...> - 2006-12-05 13:10:51
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/happydoclib/docset/docset_TAL Modified Files: MapStack.py __init__.py templatefile.py templateset.py test_templatefile.py Log Message: Fix file headers Index: MapStack.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/MapStack.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapStack.py 26 Jan 2003 19:12:11 -0000 1.1 --- MapStack.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 37,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 19-Jan-2003 07:45:43 EST', --- 37,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 19-Jan-2003 07:45:43 EST', Index: __init__.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/__init__.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** __init__.py 16 Mar 2003 23:43:23 -0000 1.4 --- __init__.py 5 Dec 2006 13:10:45 -0000 1.5 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 19-Jan-2003 16:38:01 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 19-Jan-2003 16:38:01 EST', Index: templatefile.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templatefile.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** templatefile.py 16 Mar 2003 16:28:12 -0000 1.2 --- templatefile.py 5 Dec 2006 13:10:45 -0000 1.3 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 26-Jan-2003 13:20:27 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 26-Jan-2003 13:20:27 EST', Index: templateset.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templateset.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** templateset.py 16 Mar 2003 16:29:00 -0000 1.1 --- templateset.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 16-Mar-2003 10:47:39 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 16-Mar-2003 10:47:39 EST', Index: test_templatefile.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/test_templatefile.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_templatefile.py 16 Mar 2003 16:29:14 -0000 1.2 --- test_templatefile.py 5 Dec 2006 13:10:45 -0000 1.3 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 26-Jan-2003 13:04:06 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 26-Jan-2003 13:04:06 EST', |
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/happydoclib/parseinfo Modified Files: __init__.py classinfo.py functioninfo.py imports.py moduleinfo.py parsecomments.py suite.py utils.py Log Message: Fix file headers Index: __init__.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/__init__.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** __init__.py 15 Mar 2003 14:23:20 -0000 1.5 --- __init__.py 5 Dec 2006 13:10:46 -0000 1.6 *************** *** 89,94 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 11-Nov-2001 10:44:25 EST', --- 89,94 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 11-Nov-2001 10:44:25 EST', Index: classinfo.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/classinfo.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** classinfo.py 29 Dec 2002 18:36:21 -0000 1.3 --- classinfo.py 5 Dec 2006 13:10:46 -0000 1.4 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 11-Nov-2001 10:54:26 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 11-Nov-2001 10:54:26 EST', Index: functioninfo.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/functioninfo.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functioninfo.py 29 Dec 2002 18:36:21 -0000 1.3 --- functioninfo.py 5 Dec 2006 13:10:46 -0000 1.4 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 11-Nov-2001 10:54:53 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 11-Nov-2001 10:54:53 EST', Index: imports.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/imports.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** imports.py 17 Nov 2002 15:05:43 -0000 1.1 --- imports.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 11-Nov-2001 10:51:52 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 11-Nov-2001 10:51:52 EST', Index: moduleinfo.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/moduleinfo.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** moduleinfo.py 29 Dec 2002 18:36:21 -0000 1.4 --- moduleinfo.py 5 Dec 2006 13:10:46 -0000 1.5 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 11-Nov-2001 10:52:52 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 11-Nov-2001 10:52:52 EST', Index: parsecomments.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/parsecomments.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** parsecomments.py 17 Nov 2002 15:05:43 -0000 1.1 --- parsecomments.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sat, 27-Oct-2001 17:49:02 EDT', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sat, 27-Oct-2001 17:49:02 EDT', Index: suite.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/suite.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** suite.py 7 Dec 2002 17:04:40 -0000 1.3 --- suite.py 5 Dec 2006 13:10:46 -0000 1.4 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 11-Nov-2001 10:45:58 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 11-Nov-2001 10:45:58 EST', Index: utils.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parseinfo/utils.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** utils.py 17 Nov 2002 15:05:43 -0000 1.1 --- utils.py 5 Dec 2006 13:10:46 -0000 1.2 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 11-Nov-2001 10:47:39 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 11-Nov-2001 10:47:39 EST', |
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/happydoclib/docset Modified Files: __init__.py base.py docset_MultiHTMLFile.py test_docset_MultiHTMLFile.py test_docset_TAL.py tests.py Log Message: Fix file headers Index: __init__.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/__init__.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** __init__.py 18 Nov 2002 13:42:38 -0000 1.1 --- __init__.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 1,5 **** #!/usr/bin/env python # ! # Time-stamp: <01/12/08 08:13:37 dhellmann> # # COPYRIGHT --- 1,5 ---- #!/usr/bin/env python # ! # Time-stamp: <06/12/05 07:59:34 dhellmann> # # COPYRIGHT *************** *** 35,39 **** # 'module_name':'$RCSfile$', ! 'creator':'Doug Hellmann <do...@he...>', 'project':'HappyDoc', 'created':'Sat, 03-Jun-2000 19:06:39 EDT', --- 35,39 ---- # 'module_name':'$RCSfile$', ! 'creator':'Doug Hellmann', 'project':'HappyDoc', 'created':'Sat, 03-Jun-2000 19:06:39 EDT', Index: base.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/base.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** base.py 16 Apr 2006 23:23:37 -0000 1.19 --- base.py 5 Dec 2006 13:10:45 -0000 1.20 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 17-Nov-2002 13:17:17 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 17-Nov-2002 13:17:17 EST', Index: docset_MultiHTMLFile.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_MultiHTMLFile.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** docset_MultiHTMLFile.py 16 Mar 2003 20:18:24 -0000 1.17 --- docset_MultiHTMLFile.py 5 Dec 2006 13:10:45 -0000 1.18 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 17-Nov-2002 13:32:00 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 17-Nov-2002 13:32:00 EST', Index: test_docset_MultiHTMLFile.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/test_docset_MultiHTMLFile.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** test_docset_MultiHTMLFile.py 16 Mar 2003 16:25:58 -0000 1.12 --- test_docset_MultiHTMLFile.py 5 Dec 2006 13:10:45 -0000 1.13 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 17-Nov-2002 17:31:33 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 17-Nov-2002 17:31:33 EST', Index: test_docset_TAL.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/test_docset_TAL.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_docset_TAL.py 16 Mar 2003 16:26:12 -0000 1.1 --- test_docset_TAL.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 36,41 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sun, 16-Mar-2003 08:57:53 EST', --- 36,41 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', ! 'project' : 'HappyDoc', 'created' : 'Sun, 16-Mar-2003 08:57:53 EST', Index: tests.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/tests.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tests.py 16 Mar 2003 16:26:32 -0000 1.6 --- tests.py 5 Dec 2006 13:10:45 -0000 1.7 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 17-Nov-2002 14:09:33 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 17-Nov-2002 14:09:33 EST', |
From: Doug H. <dou...@us...> - 2006-12-05 13:10:49
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/TAL In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/happydoclib/docset/docset_TAL/TAL Modified Files: zLOG.py Log Message: Fix file headers Index: zLOG.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/TAL/zLOG.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zLOG.py 26 Jan 2003 19:10:46 -0000 1.1 --- zLOG.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 36,40 **** 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann <do...@he...>', 'project' : 'HappyDoc', 'created' : 'Sun, 19-Jan-2003 16:41:30 EST', --- 36,40 ---- 'module_name' : '$RCSfile$', 'rcs_id' : '$Id$', ! 'creator' : 'Doug Hellmann', 'project' : 'HappyDoc', 'created' : 'Sun, 19-Jan-2003 16:41:30 EST', |
From: Doug H. <dou...@us...> - 2006-12-05 13:10:48
|
Update of /cvsroot/happydoc/HappyDoc3/TestCases In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/TestCases Modified Files: __init__.py Log Message: Fix file headers Index: __init__.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/TestCases/__init__.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** __init__.py 17 Nov 2002 14:51:44 -0000 1.1 --- __init__.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 37,41 **** 'rcs_id' : '$Id$', 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Sat, 06-Oct-2001 12:23:43 EDT', --- 37,41 ---- 'rcs_id' : '$Id$', 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'HappyDoc', 'created' : 'Sat, 06-Oct-2001 12:23:43 EDT', |
From: Doug H. <dou...@us...> - 2006-12-05 13:10:48
|
Update of /cvsroot/happydoc/HappyDoc3/TestCases/parseinfo In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3531/TestCases/parseinfo Modified Files: test_variable_extraction.py test_variable_extraction_with_exception.py Log Message: Fix file headers Index: test_variable_extraction.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/TestCases/parseinfo/test_variable_extraction.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_variable_extraction.py 17 Nov 2002 14:51:44 -0000 1.1 --- test_variable_extraction.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 46,50 **** 'rcs_id' : '$Id$', 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Thu, 04-Oct-2001 10:59:20 EDT', --- 46,50 ---- 'rcs_id' : '$Id$', 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'HappyDoc', 'created' : 'Thu, 04-Oct-2001 10:59:20 EDT', Index: test_variable_extraction_with_exception.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/TestCases/parseinfo/test_variable_extraction_with_exception.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_variable_extraction_with_exception.py 17 Nov 2002 14:51:44 -0000 1.1 --- test_variable_extraction_with_exception.py 5 Dec 2006 13:10:45 -0000 1.2 *************** *** 48,52 **** 'rcs_id' : '$Id$', 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'UNSPECIFIED', 'created' : 'Thu, 04-Oct-2001 10:59:20 EDT', --- 48,52 ---- 'rcs_id' : '$Id$', 'creator' : 'Doug Hellmann <Dou...@bi...>', ! 'project' : 'HappyDoc', 'created' : 'Thu, 04-Oct-2001 10:59:20 EDT', |
From: Doug H. <dou...@us...> - 2006-12-05 12:50:02
|
Update of /cvsroot/happydoc/HappyDoc3 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27492 Modified Files: Makefile Log Message: Update project setting Index: Makefile =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 23 Apr 2003 12:32:23 -0000 1.3 --- Makefile 5 Dec 2006 12:49:57 -0000 1.4 *************** *** 11,14 **** --- 11,15 ---- PRODUCT_NAME=HappyDoc + CVS_PROJECT=HappyDoc3 FTP_SERVER="upload.sourceforge.net" |
From: Doug H. <dou...@us...> - 2006-12-05 12:48:27
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27063/happydoclib/docset/docset_TAL Modified Files: hdTALES.py Log Message: Fix assignment to None error Index: hdTALES.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/hdTALES.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hdTALES.py 26 Jan 2003 19:17:15 -0000 1.1 --- hdTALES.py 5 Dec 2006 12:48:15 -0000 1.2 *************** *** 280,286 **** return not not self.evaluate(expr) ! def evaluateText(self, expr, None=None): text = self.evaluate(expr) ! if text is Default or text is None: return text return str(text) --- 280,286 ---- return not not self.evaluate(expr) ! def evaluateText(self, expr, none=None): text = self.evaluate(expr) ! if text is Default or text is none: return text return str(text) |
From: Doug H. <dou...@us...> - 2006-04-16 23:23:42
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9914/happydoclib/docset Modified Files: base.py Log Message: Multi-file docset should quietly ignore function nodes, assuming they are included in the file-level node output. Also, when we do skip a node, print the node name instead of the node filename (we might not be skipping the whole file). Index: base.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/base.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** base.py 16 Mar 2003 20:17:30 -0000 1.18 --- base.py 16 Apr 2006 23:23:37 -0000 1.19 *************** *** 280,286 **** """ mimetype, encoding = packageTreeNode.getMimeType() ! filename = packageTreeNode.getInputFilename() ! self.statusMessage('Skiping unrecognized file %s with mimetype %s' % ( ! filename, mimetype, )) --- 280,286 ---- """ mimetype, encoding = packageTreeNode.getMimeType() ! full_name = packageTreeNode.getCanonicalName() ! self.statusMessage('Skipping %s with unrecognized mimetype %s' % ( ! full_name, mimetype, )) *************** *** 373,376 **** --- 373,377 ---- ('image/jpeg' , 'copyInputFileToOutput'), ('image/png' , 'copyInputFileToOutput'), + ('application/x-function' , 'noopHandler'), ] for mimetype, writer_name in mimetype_writers: *************** *** 469,472 **** --- 470,478 ---- return + def noopHandler(self, packageTreeNode): + """Handler that does nothing. + """ + return + def processDirectory(self, packageTreeNode): """Handler for application/x-directory nodes. |
From: Doug H. <dou...@us...> - 2006-04-16 23:22:30
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9045/happydoclib/docstring/StructuredText Modified Files: ClassicDocumentClass.py ClassicStructuredText.py DocumentClass.py ST.py STDOM.py StructuredText.py Zwiki.py __init__.py ts_regex.py Log Message: Update the StructuredText parser. Index: ClassicDocumentClass.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/ClassicDocumentClass.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ClassicDocumentClass.py 17 Nov 2002 00:26:19 -0000 1.1.1.1 --- ClassicDocumentClass.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 15,20 **** from STletters import letters ! StringType=type('') ! ListType=type([]) class StructuredTextExample(ST.StructuredTextParagraph): --- 15,20 ---- from STletters import letters ! from types import StringType, UnicodeType, ListType ! StringTypes = (StringType, UnicodeType) class StructuredTextExample(ST.StructuredTextParagraph): *************** *** 24,30 **** t=[]; a=t.append for s in subs: a(s.getNodeValue()) ! apply(ST.StructuredTextParagraph.__init__, ! (self, '\n\n'.join(t), ()), ! kw) def getColorizableTexts(self): return () --- 24,28 ---- t=[]; a=t.append for s in subs: a(s.getNodeValue()) ! ST.StructuredTextParagraph.__init__(self, '\n\n'.join(t), (), **kw) def getColorizableTexts(self): return () *************** *** 47,51 **** def __init__(self, title, src, subs, **kw): ! apply(ST.StructuredTextParagraph.__init__, (self, src, subs), kw) self._title=title --- 45,49 ---- def __init__(self, title, src, subs, **kw): ! ST.StructuredTextParagraph.__init__(self, src, subs, **kw) self._title=title *************** *** 63,69 **** """Represents a section of a document with a title and a body""" def __init__(self, src, subs=None, **kw): ! apply(ST.StructuredTextParagraph.__init__, ! (self, StructuredTextSectionTitle(src), subs), ! kw) def getColorizableTexts(self): --- 61,66 ---- """Represents a section of a document with a title and a body""" def __init__(self, src, subs=None, **kw): ! ST.StructuredTextParagraph.__init__( ! self, StructuredTextSectionTitle(src), subs, **kw) def getColorizableTexts(self): *************** *** 83,87 **** def __init__(self, rows, src, subs, **kw): ! apply(ST.StructuredTextDocument.__init__,(self,subs),kw) self._rows = [] for row in rows: --- 80,84 ---- def __init__(self, rows, src, subs, **kw): ! ST.StructuredTextDocument.__init__(self, subs, **kw) self._rows = [] for row in rows: *************** *** 139,143 **** [('this is column one',1), ('this is column two',1)] """ ! apply(ST.StructuredTextDocument.__init__,(self,[]),kw) self._columns = [] for column in row: --- 136,140 ---- [('this is column one',1), ('this is column two',1)] """ ! ST.StructuredTextDocument.__init__(self, [], **kw) self._columns = [] for column in row: *************** *** 159,163 **** def __init__(self,text,span,kw): ! apply(ST.StructuredTextParagraph.__init__,(self,text,[]),kw) self._span = span --- 156,160 ---- def __init__(self,text,span,kw): ! ST.StructuredTextParagraph.__init__(self, text, [], **kw) self._span = span *************** *** 236,240 **** def __call__(self, doc): ! if type(doc) is type(''): doc=ST.StructuredText(doc) doc.setSubparagraphs(self.color_paragraphs( --- 233,237 ---- def __call__(self, doc): ! if type(doc) in StringTypes: doc=ST.StructuredText(doc) doc.setSubparagraphs(self.color_paragraphs( *************** *** 246,250 **** def parse(self, raw_string, text_type, ! type=type, st=type(''), lt=type([])): """ --- 243,247 ---- def parse(self, raw_string, text_type, ! type=type, sts=StringTypes, lt=type([])): """ *************** *** 262,266 **** append=tmp.append ! if type(text_type) is st: text_type=getattr(self, text_type) while 1: --- 259,263 ---- append=tmp.append ! if type(text_type) in sts: text_type=getattr(self, text_type) while 1: *************** *** 273,277 **** tt=type(t) ! if tt is st: # if we get a string back, add it to text to be parsed raw_string = t+raw_string[end:len(raw_string)] --- 270,274 ---- tt=type(t) ! if tt in sts: # if we get a string back, add it to text to be parsed raw_string = t+raw_string[end:len(raw_string)] *************** *** 300,309 **** for text_type in types: ! if type(str) is StringType: str = self.parse(str, text_type) elif type(str) is ListType: r=[]; a=r.append for s in str: ! if type(s) is StringType: s=self.parse(s, text_type) if type(s) is ListType: r[len(r):]=s --- 297,306 ---- for text_type in types: ! if type(str) in StringTypes: str = self.parse(str, text_type) elif type(str) is ListType: r=[]; a=r.append for s in str: ! if type(s) in StringTypes: s=self.parse(s, text_type) if type(s) is ListType: r[len(r):]=s *************** *** 328,332 **** def color_paragraphs(self, raw_paragraphs, type=type, sequence_types=(type([]), type(())), ! st=type('')): result=[] for paragraph in raw_paragraphs: --- 325,329 ---- def color_paragraphs(self, raw_paragraphs, type=type, sequence_types=(type([]), type(())), ! sts=StringTypes): result=[] for paragraph in raw_paragraphs: *************** *** 337,341 **** for pt in self.paragraph_types: ! if type(pt) is st: # grab the corresponding function pt=getattr(self, pt) --- 334,338 ---- for pt in self.paragraph_types: ! if type(pt) in sts: # grab the corresponding function pt=getattr(self, pt) Index: ClassicStructuredText.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/ClassicStructuredText.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ClassicStructuredText.py 17 Nov 2002 00:26:20 -0000 1.1.1.1 --- ClassicStructuredText.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 135,141 **** import ts_regex ! import regex ! from ts_regex import gsub ! import string,re --- 135,139 ---- import ts_regex ! import string, re *************** *** 232,238 **** class Table: ! CELL=' <TD ALIGN=CENTER COLSPAN=%i>%s</TD>\n' ! ROW=' <TR>\n%s </TR>\n' ! TABLE='\n<TABLE BORDER=1 CELLPADDING=2>\n%s</TABLE>' def create(self,aPar, td_reg=re.compile(r'[ \t\n]*\|\|([^\0|]*)') --- 230,236 ---- class Table: ! CELL=' <td align="center" colspan="%i">%s</td>\n' ! ROW=' <tr>\n%s </tr>\n' ! TABLE='\n<table border="1" cellpadding="2">\n%s</table>' def create(self,aPar, td_reg=re.compile(r'[ \t\n]*\|\|([^\0|]*)') *************** *** 283,287 **** def __init__(self, aStructuredString, level=0, ! paragraph_divider=regex.compile('\(\r?\n *\)+\r?\n'), ): '''Convert a structured text string into a structured text object. --- 281,285 ---- def __init__(self, aStructuredString, level=0, ! paragraph_divider=ts_regex.compile('\(\r?\n *\)+\r?\n'), ): '''Convert a structured text string into a structured text object. *************** *** 402,409 **** r='' else: ! r='<PRE>\n' for s in structure: r="%s%s\n\n%s" % (r,html_quote(s[0]),self.pre(s[1],1)) ! if not tagged: r=r+'</PRE>\n' return r --- 400,407 ---- r='' else: ! r='<pre>\n' for s in structure: r="%s%s\n\n%s" % (r,html_quote(s[0]),self.pre(s[1],1)) ! if not tagged: r=r.rstrip()+'\n</pre>\n' return r Index: DocumentClass.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/DocumentClass.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DocumentClass.py 17 Nov 2002 00:26:21 -0000 1.1.1.1 --- DocumentClass.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 16,21 **** strongem_punc, phrase_delimiters,dbl_quoted_punc ! StringType=type('') ! ListType=type([]) def flatten(obj, append): --- 16,21 ---- strongem_punc, phrase_delimiters,dbl_quoted_punc ! from types import StringType, UnicodeType, ListType ! StringTypes = (StringType, UnicodeType) def flatten(obj, append): *************** *** 35,41 **** for s in subs: flatten(s, a) ! apply(ST.StructuredTextParagraph.__init__, ! (self, '\n\n'.join(t), ()), ! kw) def getColorizableTexts(self): return () --- 35,39 ---- for s in subs: flatten(s, a) ! ST.StructuredTextParagraph.__init__(self, '\n\n'.join(t), (), **kw) def getColorizableTexts(self): return () *************** *** 58,62 **** def __init__(self, title, src, subs, **kw): ! apply(ST.StructuredTextParagraph.__init__, (self, src, subs), kw) self._title=title --- 56,60 ---- def __init__(self, title, src, subs, **kw): ! ST.StructuredTextParagraph.__init__(self, src, subs, **kw) self._title=title *************** *** 74,80 **** """Represents a section of a document with a title and a body""" def __init__(self, src, subs=None, **kw): ! apply(ST.StructuredTextParagraph.__init__, ! (self, StructuredTextSectionTitle(src), subs), ! kw) def getColorizableTexts(self): --- 72,77 ---- """Represents a section of a document with a title and a body""" def __init__(self, src, subs=None, **kw): ! ST.StructuredTextParagraph.__init__( ! self, StructuredTextSectionTitle(src), subs, **kw) def getColorizableTexts(self): *************** *** 94,98 **** def __init__(self, rows, src, subs, **kw): ! apply(ST.StructuredTextParagraph.__init__,(self,subs),kw) self._rows = [] for row in rows: --- 91,95 ---- def __init__(self, rows, src, subs, **kw): ! ST.StructuredTextParagraph.__init__(self, subs, **kw) self._rows = [] for row in rows: *************** *** 150,155 **** return self.getColorizableTexts() ! def _setColorizableTexts(self): ! return self.setColorizableTexts() # StructuredTextRow holds StructuredTextColumns --- 147,152 ---- return self.getColorizableTexts() ! def _setColorizableTexts(self, texts): ! return self.setColorizableTexts(texts) # StructuredTextRow holds StructuredTextColumns *************** *** 165,169 **** """ ! apply(ST.StructuredTextParagraph.__init__,(self,[]),kw) self._columns = [] --- 162,166 ---- """ ! ST.StructuredTextParagraph.__init__(self, [], **kw) self._columns = [] *************** *** 198,202 **** def __init__(self,text,span,align,valign,typ,kw): ! apply(ST.StructuredTextParagraph.__init__,(self,text,[]),kw) self._span = span self._align = align --- 195,199 ---- def __init__(self,text,span,align,valign,typ,kw): ! ST.StructuredTextParagraph.__init__(self, text, [], **kw) self._span = span self._align = align *************** *** 239,245 **** for k, v in kw.items(): setattr(self, k, v) ! def getChildren(self, type=type, lt=type([])): v=self._value ! if type(v) is not lt: v=[v] return v --- 236,242 ---- for k, v in kw.items(): setattr(self, k, v) ! def getChildren(self): v=self._value ! if not isinstance(v, ListType): v=[v] return v *************** *** 295,306 **** #'doc_underline' text_types = [ - # - # Leave sgml before literal here - # so that quotable characters embedded - # in single quotes are NOT escaped. - # - dhellmann - HappyDoc - # - 'doc_sgml', 'doc_literal', 'doc_inner_link', 'doc_named_link', --- 292,297 ---- #'doc_underline' text_types = [ 'doc_literal', + 'doc_sgml', 'doc_inner_link', 'doc_named_link', *************** *** 315,319 **** def __call__(self, doc): ! if type(doc) is type(''): doc=ST.StructuredText(doc) doc.setSubparagraphs(self.color_paragraphs( --- 306,310 ---- def __call__(self, doc): ! if type(doc) in StringTypes: doc=ST.StructuredText(doc) doc.setSubparagraphs(self.color_paragraphs( *************** *** 325,329 **** def parse(self, raw_string, text_type, ! type=type, st=type(''), lt=type([])): """ --- 316,320 ---- def parse(self, raw_string, text_type, ! type=type, sts=StringTypes, lt=type([])): """ *************** *** 341,345 **** append=tmp.append ! if type(text_type) is st: text_type=getattr(self, text_type) while 1: --- 332,336 ---- append=tmp.append ! if type(text_type) in sts: text_type=getattr(self, text_type) while 1: *************** *** 352,356 **** tt=type(t) ! if tt is st: # if we get a string back, add it to text to be parsed raw_string = t+raw_string[end:len(raw_string)] --- 343,347 ---- tt=type(t) ! if tt in sts: # if we get a string back, add it to text to be parsed raw_string = t+raw_string[end:len(raw_string)] *************** *** 379,388 **** for text_type in types: ! if type(str) is StringType: str = self.parse(str, text_type) elif type(str) is ListType: r=[]; a=r.append for s in str: ! if type(s) is StringType: s=self.parse(s, text_type) if type(s) is ListType: r[len(r):]=s --- 370,379 ---- for text_type in types: ! if type(str) in StringTypes: str = self.parse(str, text_type) elif type(str) is ListType: r=[]; a=r.append for s in str: ! if type(s) in StringTypes: s=self.parse(s, text_type) if type(s) is ListType: r[len(r):]=s *************** *** 407,411 **** def color_paragraphs(self, raw_paragraphs, type=type, sequence_types=(type([]), type(())), ! st=type('')): result=[] for paragraph in raw_paragraphs: --- 398,402 ---- def color_paragraphs(self, raw_paragraphs, type=type, sequence_types=(type([]), type(())), ! sts=StringTypes): result=[] for paragraph in raw_paragraphs: *************** *** 415,419 **** for pt in self.paragraph_types: ! if type(pt) is st: # grab the corresponding function pt=getattr(self, pt) --- 406,410 ---- for pt in self.paragraph_types: ! if type(pt) in sts: # grab the corresponding function pt=getattr(self, pt) *************** *** 434,439 **** for att in atts: kw[att] = getattr(paragraph, att) subs = self.color_paragraphs(paragraph.getSubparagraphs()) ! new_paragraphs=apply(ST.StructuredTextParagraph, ! (paragraph.getColorizableTexts()[0], subs), kw), # color the inline StructuredText types --- 425,430 ---- for att in atts: kw[att] = getattr(paragraph, att) subs = self.color_paragraphs(paragraph.getSubparagraphs()) ! new_paragraphs=ST.StructuredTextParagraph( ! paragraph. getColorizableTexts()[0], subs, **kw), # color the inline StructuredText types *************** *** 789,793 **** atts = getattr(paragraph, '_attributes', []) for att in atts: kw[att] = getattr(paragraph, att) ! return apply(ST.StructuredTextParagraph, (top[:-1], [subs]), kw) if top.find('\n') >= 0: return None --- 780,784 ---- atts = getattr(paragraph, '_attributes', []) for att in atts: kw[att] = getattr(paragraph, att) ! return ST.StructuredTextParagraph(top[:-1], [subs], **kw) if top.find('\n') >= 0: return None *************** *** 941,944 **** --- 932,937 ---- text = s[start:end] return (StructuredTextSGML(text),start,end) + else: + return None Index: ST.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/ST.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ST.py 17 Nov 2002 00:26:21 -0000 1.1.1.1 --- ST.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- import re, STDOM + from types import ListType ##################################################################### *************** *** 188,194 **** for k, v in kw.items(): setattr(self, k, v) ! def getChildren(self, type=type, lt=type([])): src=self._src ! if type(src) is not lt: src=[src] return src+self._subs --- 189,195 ---- for k, v in kw.items(): setattr(self, k, v) ! def getChildren(self): src=self._src ! if not isinstance(src, ListType): src=[src] return src+self._subs *************** *** 199,202 **** --- 200,205 ---- if hasattr(self, name): return STDOM.Attr(name, getattr(self, name)) + else: + return None def getAttributes(self): *************** *** 232,237 **** """ ! def _get_Children(self, type=type, lt=type([])): ! return self.getChildren(type,lt) def _get_Attribute(self, name): --- 235,240 ---- """ ! def _get_Children(self): ! return self.getChildren() def _get_Attribute(self, name): *************** *** 264,270 **** def __init__(self, subs=None, **kw): ! apply(StructuredTextParagraph.__init__, ! (self, '', subs), ! kw) def getChildren(self): --- 267,271 ---- def __init__(self, subs=None, **kw): ! StructuredTextParagraph.__init__(self, '', subs, **kw) def getChildren(self): Index: STDOM.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/STDOM.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** STDOM.py 17 Nov 2002 00:26:27 -0000 1.1.1.1 --- STDOM.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 17,20 **** --- 17,23 ---- """ + from types import StringType, UnicodeType + StringTypes = (StringType, UnicodeType) + # Node type codes # --------------- *************** *** 82,86 **** """ ! def getChildNodes(self, type=type, st=type('')): """ Returns a NodeList that contains all children of this node. --- 85,89 ---- """ ! def getChildNodes(self, type=type, sts=StringTypes): """ Returns a NodeList that contains all children of this node. *************** *** 90,99 **** r=[] for n in self.getChildren(): ! if type(n) is st: n=TextNode(n) r.append(n.__of__(self)) return NodeList(r) ! def getFirstChild(self, type=type, st=type('')): """ The first child of this node. If there is no such node --- 93,102 ---- r=[] for n in self.getChildren(): ! if type(n) in sts: n=TextNode(n) r.append(n.__of__(self)) return NodeList(r) ! def getFirstChild(self, type=type, sts=StringTypes): """ The first child of this node. If there is no such node *************** *** 107,116 **** n=children[0] ! if type(n) is st: n=TextNode(n) return n.__of__(self) ! def getLastChild(self, type=type, st=type('')): """ The last child of this node. If there is no such node --- 110,119 ---- n=children[0] ! if type(n) in sts: n=TextNode(n) return n.__of__(self) ! def getLastChild(self, type=type, sts=StringTypes): """ The last child of this node. If there is no such node *************** *** 119,124 **** children = self.getChildren() if not children: return None ! n=chidren[-1] ! if type(n) is st: n=TextNode(n) return n.__of__(self) --- 122,127 ---- children = self.getChildren() if not children: return None ! n=children[-1] ! if type(n) in sts: n=TextNode(n) return n.__of__(self) *************** *** 127,138 **** """ ! def _get_ChildNodes(self, type=type, st=type('')): ! return self.getChildNodes(type,st) ! def _get_FirstChild(self, type=type, st=type('')): ! return self.getFirstChild(type,st) ! def _get_LastChild(self, type=type, st=type('')): ! return self.getLastChild(type,st) class NodeWrapper(ParentNode): --- 130,141 ---- """ ! def _get_ChildNodes(self, type=type, sts=StringTypes): ! return self.getChildNodes(type,sts) ! def _get_FirstChild(self, type=type, sts=StringTypes): ! return self.getFirstChild(type,sts) ! def _get_LastChild(self, type=type, sts=StringTypes): ! return self.getLastChild(type,sts) class NodeWrapper(ParentNode): *************** *** 166,175 **** return None ! def getPreviousSibling(self, ! type=type, ! st=type(''), ! getattr=getattr, ! None=None): ! """ The node immediately preceding this node. If --- 169,173 ---- return None ! def getPreviousSibling(self): """ The node immediately preceding this node. If *************** *** 191,195 **** except IndexError: return None else: ! if type(n) is st: n=TextNode(n) n._DOMIndex=index --- 189,193 ---- except IndexError: return None else: ! if type(n) in StringTypes: n=TextNode(n) n._DOMIndex=index *************** *** 197,201 **** ! def getNextSibling(self, type=type, st=type('')): """ The node immediately preceding this node. If --- 195,199 ---- ! def getNextSibling(self): """ The node immediately preceding this node. If *************** *** 217,221 **** return None else: ! if type(n) is st: n=TextNode(n) n._DOMIndex=index --- 215,219 ---- return None else: ! if type(n) in StringTypes: n=TextNode(n) n._DOMIndex=index *************** *** 238,251 **** return self._getDOMIndex(children,getattr) ! def _get_PreviousSibling(self, ! type=type, ! st=type(''), ! getattr=getattr, ! None=None): ! ! return self.getPreviousSibling(type,st,getattr,None) ! def _get_NextSibling(self, type=type, st=type('')): ! return self.getNextSibling(type,st) def _get_OwnerDocument(self): --- 236,244 ---- return self._getDOMIndex(children,getattr) ! def _get_PreviousSibling(self): ! return self.getPreviousSibling() ! def _get_NextSibling(self): ! return self.getNextSibling() def _get_OwnerDocument(self): *************** *** 289,295 **** def getPreviousSibling(self, type=type, ! st=type(''), ! getattr=getattr, ! None=None): """ The node immediately preceding this node. If --- 282,287 ---- def getPreviousSibling(self, type=type, ! sts=StringTypes, ! getattr=getattr): """ The node immediately preceding this node. If *************** *** 297,301 **** """ ! def getNextSibling(self, type=type, st=type('')): """ The node immediately preceding this node. If --- 289,293 ---- """ ! def getNextSibling(self, type=type, sts=StringTypes): """ The node immediately preceding this node. If *************** *** 341,353 **** return self.getChildren() ! def _get_PreviousSibling(self, ! type=type, ! st=type(''), ! getattr=getattr, ! None=None): ! ! return self.getPreviousSibling(type,st,getattr,None) ! def _get_NextSibling(self, type=type, st=type('')): return self.getNextSibling() --- 333,340 ---- return self.getChildren() ! def _get_PreviousSibling(self): ! return self.getPreviousSibling() ! def _get_NextSibling(self): return self.getNextSibling() *************** *** 408,415 **** return ELEMENT_NODE ! def getNodeValue(self, type=type, st=type('')): r=[] for c in self.getChildren(): ! if type(c) is not st: c=c.getNodeValue() r.append(c) --- 395,402 ---- return ELEMENT_NODE ! def getNodeValue(self): r=[] for c in self.getChildren(): ! if type(c) not in StringTypes: c=c.getNodeValue() r.append(c) *************** *** 481,486 **** return self.getNodeType() ! def _get_NodeValue(self, type=type, st=type('')): ! return self.getNodeValue(type,st) def _get_ParentNode(self): --- 468,473 ---- return self.getNodeType() ! def _get_NodeValue(self): ! return self.getNodeValue() def _get_ParentNode(self): *************** *** 518,522 **** self._data = list or [] ! def __getitem__(self, index, type=type, st=type('')): return self._data[index] --- 505,509 ---- self._data = list or [] ! def __getitem__(self, index, type=type, sts=StringTypes): return self._data[index] Index: StructuredText.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/StructuredText.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** StructuredText.py 17 Nov 2002 00:26:27 -0000 1.1.1.1 --- StructuredText.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 16,20 **** ! import HTMLClass, DocumentClass, ClassicDocumentClass import DocumentWithImages, HTMLWithImages from ST import Basic --- 16,20 ---- ! import HTMLClass, DocumentClass import DocumentWithImages, HTMLWithImages from ST import Basic Index: Zwiki.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/Zwiki.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Zwiki.py 17 Nov 2002 00:26:27 -0000 1.1.1.1 --- Zwiki.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 1,3 **** - #!/usr/bin/python ############################################################################## # --- 1,2 ---- Index: __init__.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/__init__.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** __init__.py 17 Nov 2002 00:26:27 -0000 1.1.1.1 --- __init__.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 18,22 **** import DocBookClass import HTMLWithImages ! from types import StringType import DocumentWithImages --- 18,22 ---- import DocBookClass import HTMLWithImages ! from types import StringType, UnicodeType import DocumentWithImages *************** *** 25,29 **** def HTML(src, level=1): ! if isinstance(src, StringType): return ClassicHTML(src, level) return HTMLNG(src, level) --- 25,29 ---- def HTML(src, level=1): ! if isinstance(src, StringType) or isinstance(src, UnicodeType): return ClassicHTML(src, level) return HTMLNG(src, level) Index: ts_regex.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/ts_regex.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ts_regex.py 17 Nov 2002 00:26:27 -0000 1.1.1.1 --- ts_regex.py 16 Apr 2006 23:22:21 -0000 1.2 *************** *** 1,85 **** ############################################################################## ! # ! # Zope Public License (ZPL) Version 1.0 ! # ------------------------------------- ! # ! # Copyright (c) Digital Creations. All rights reserved. ! # ! # This license has been certified as Open Source(tm). ! # ! # Redistribution and use in source and binary forms, with or without ! # modification, are permitted provided that the following conditions are ! # met: ! # ! # 1. Redistributions in source code must retain the above copyright ! # notice, this list of conditions, and the following disclaimer. ! # ! # 2. Redistributions in binary form must reproduce the above copyright ! # notice, this list of conditions, and the following disclaimer in ! # the documentation and/or other materials provided with the ! # distribution. ! # ! # 3. Digital Creations requests that attribution be given to Zope ! # in any manner possible. Zope includes a "Powered by Zope" ! # button that is installed by default. While it is not a license ! # violation to remove this button, it is requested that the ! # attribution remain. A significant investment has been put ! # into Zope, and this effort will continue if the Zope community ! # continues to grow. This is one way to assure that growth. ! # ! # 4. All advertising materials and documentation mentioning ! # features derived from or use of this software must display ! # the following acknowledgement: ! # ! # "This product includes software developed by Digital Creations ! # for use in the Z Object Publishing Environment ! # (http://www.zope.org/)." ! # ! # In the event that the product being advertised includes an ! # intact Zope distribution (with copyright and license included) ! # then this clause is waived. ! # ! # 5. Names associated with Zope or Digital Creations must not be used to ! # endorse or promote products derived from this software without ! # prior written permission from Digital Creations. ! # ! # 6. Modified redistributions of any form whatsoever must retain ! # the following acknowledgment: ! # ! # "This product includes software developed by Digital Creations ! # for use in the Z Object Publishing Environment ! # (http://www.zope.org/)." ! # ! # Intact (re-)distributions of any official Zope release do not ! # require an external acknowledgement. ! # ! # 7. Modifications are encouraged but must be packaged separately as ! # patches to official Zope releases. Distributions that do not ! # clearly separate the patches from the original work must be clearly ! # labeled as unofficial distributions. Modifications which do not ! # carry the name Zope may be packaged in any form, as long as they ! # conform to all of the clauses above. ! # ! # ! # Disclaimer ! # ! # THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY ! # EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ! # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DIGITAL CREATIONS OR ITS ! # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ! # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ! # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ! # USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ! # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ! # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ! # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ! # SUCH DAMAGE. ! # ! # ! # This software consists of contributions made by Digital Creations and ! # many individuals on behalf of Digital Creations. Specific ! # attributions are listed in the accompanying credits file. ! # ############################################################################## """Provide a thread-safe interface to regex --- 1,13 ---- ############################################################################## ! # ! # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved. ! # ! # This software is subject to the provisions of the Zope Public License, ! # Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. ! # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED ! # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ! # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS ! # FOR A PARTICULAR PURPOSE ! # ############################################################################## """Provide a thread-safe interface to regex *************** *** 89,93 **** from regsub import split, sub, gsub, splitx, capwords ! try: import thread except: --- 17,21 ---- from regsub import split, sub, gsub, splitx, capwords ! try: import thread except: *************** *** 107,111 **** def __call__(self, *args, **kw): self._a() ! try: return apply(self._f, args, kw) finally: self._r() --- 35,39 ---- def __call__(self, *args, **kw): self._a() ! try: return self._f(*args, **kw) finally: self._r() *************** *** 124,128 **** def __init__(self, *args): ! self._r=r=apply(regex.compile,args) self._init(r) --- 52,56 ---- def __init__(self, *args): ! self._r=r=regex(*compile, **args) self._init(r) *************** *** 144,148 **** try: return self._r.search(string, pos) finally: self.__r() ! def search_group(self, str, group, pos=0): """Search a string for a pattern. --- 72,76 ---- try: return self._r.search(string, pos) finally: self.__r() ! def search_group(self, str, group, pos=0): """Search a string for a pattern. *************** *** 157,161 **** l=r.search(str, pos) if l < 0: return None ! return l, apply(r.group, group) finally: self.__r() --- 85,89 ---- l=r.search(str, pos) if l < 0: return None ! return l, r.group(*group) finally: self.__r() *************** *** 172,176 **** l=r.match(str, pos) if l < 0: return None ! return l, apply(r.group, group) finally: self.__r() --- 100,104 ---- l=r.match(str, pos) if l < 0: return None ! return l, r.group(*group) finally: self.__r() *************** *** 206,215 **** def __init__(self, *args): ! self._r=r=apply(regex.symcomp,args) self._init(r) self.groupindex=r.groupindex - - - - - --- 134,138 ---- def __init__(self, *args): ! self._r=r=regex.symcomp(*args) self._init(r) self.groupindex=r.groupindex |
From: Doug H. <dou...@us...> - 2006-04-16 23:21:18
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8283/happydoclib Modified Files: appclass.py Log Message: Do not override True and False any more. Index: appclass.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/appclass.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** appclass.py 16 Mar 2003 16:24:24 -0000 1.15 --- appclass.py 16 Apr 2006 23:21:11 -0000 1.16 *************** *** 75,81 **** # - True = 1 - False = None - class HappyDoc(happydoclib.CommandLineApp.CommandLineApp): """ --- 75,78 ---- |
From: Doug H. <dou...@us...> - 2003-04-23 12:33:32
|
Update of /cvsroot/happydoc/HappyDoc3 In directory sc8-pr-cvs1:/tmp/cvs-serv15067 Modified Files: Makefile Log Message: Use proctor from its normal installed location. Index: Makefile =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 16 Mar 2003 16:23:55 -0000 1.2 --- Makefile 23 Apr 2003 12:32:23 -0000 1.3 *************** *** 27,31 **** include Package.mak ! PROCTOR="../Proctor/proctorbatch" PROCTOR_VERBOSITY="-vvv" PROCTOR_ARGS="--interleaved" --- 27,31 ---- include Package.mak ! PROCTOR="proctorbatch" PROCTOR_VERBOSITY="-vvv" PROCTOR_ARGS="--interleaved" |
From: Doug H. <dou...@us...> - 2003-03-18 17:23:47
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templates/default In directory sc8-pr-cvs1:/tmp/cvs-serv13208/happydoclib/docset/docset_TAL/templates/default Modified Files: toc.pt Log Message: Use the new macro for producing a descriptive list in a table format. Index: toc.pt =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templates/default/toc.pt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** toc.pt 16 Mar 2003 23:44:44 -0000 1.3 --- toc.pt 18 Mar 2003 17:23:40 -0000 1.4 *************** *** 28,89 **** </tal:block> ! <tal:block tal:condition="other_documentation|nothing"> ! <h2>Other Documentation</h2> - <table class="descriptive_list"> - - <tr tal:repeat="subnode other_documentation"> - <td><a href="" - tal:attributes="href python: docset.getHREFToNode(node, subnode)" - tal:content="subnode/getName"> - Plain Text File Name - </a> - </td> - <td tal:content="structure subnode/getOneLiner"> - One line description - </td> - </tr> - - </table> </tal:block> ! <tal:block tal:condition="python_files|nothing"> ! <h2>Python Files</h2> ! ! <table class="descriptive_list"> ! ! <tr tal:repeat="subnode python_files"> ! <td><a href="" ! tal:attributes="href python: docset.getHREFToNode(node, subnode)" ! tal:content="subnode/getName"> ! Python File Name ! </a> ! </td> ! <td tal:content="structure subnode/getOneLiner"> ! One line description ! </td> ! </tr> ! ! </table> </tal:block> ! ! <tal:block tal:condition="subdirectories|nothing"> ! <h2>Subdirectories</h2> ! ! <table class="descriptive_list"> ! ! <tr tal:repeat="subnode subdirectories"> ! <td><a href="" ! tal:attributes="href python: docset.getHREFToNode(node, subnode)" ! tal:content="subnode/getName"> ! Directory Name ! </a> ! </td> ! <td tal:content="structure subnode/getOneLiner"> ! One line description ! </td> ! </tr> ! ! </table> </tal:block> --- 28,56 ---- </tal:block> ! <tal:block tal:condition="other_documentation|nothing" ! tal:define="subnodes other_documentation" ! > ! ! <div ! metal:use-macro="templates/python_macros.pt/macros/subnode_list"> ! <h2 metal:fill-slot="title_slot">Other Documentation</h2> ! </div> </tal:block> ! <tal:block tal:condition="python_files|nothing" ! tal:define="subnodes python_files"> ! <div ! metal:use-macro="templates/python_macros.pt/macros/subnode_list"> ! <h2 metal:fill-slot="title_slot">Python Files</h2> ! </div> </tal:block> ! ! <tal:block tal:condition="subdirectories|nothing" ! tal:define="subnodes subdirectories"> ! <div ! metal:use-macro="templates/python_macros.pt/macros/subnode_list"> ! <h2 metal:fill-slot="title_slot">Subdirectories</h2> ! </div> </tal:block> |
From: Doug H. <dou...@us...> - 2003-03-18 17:23:19
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templates/default In directory sc8-pr-cvs1:/tmp/cvs-serv13085/happydoclib/docset/docset_TAL/templates/default Modified Files: python_macros.pt Log Message: Add a macro for producing a descriptive list in a table format. Add a list of classes to the output of a Python module. Index: python_macros.pt =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templates/default/python_macros.pt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** python_macros.pt 16 Mar 2003 23:43:50 -0000 1.1 --- python_macros.pt 18 Mar 2003 17:23:14 -0000 1.2 *************** *** 11,14 **** --- 11,49 ---- <body> + <!-- DUMP A LIST OF SUBNODES --> + <!-- Caller should set up "subnodes" variable --> + + <tal:block metal:define-macro="subnode_list" + xmlns:tal="http://xml.zope.org/namespaces/tal" + xmlns:metal="http://xml.zope.org/namespaces/metal"> + <metal:block metal:define-slot="title_slot"> + Descriptive list title + </metal:block> + <table class="descriptive_list"> + + <tr tal:repeat="subnode subnodes"> + <td><a href="" + tal:attributes="href python: docset.getHREFToNode(node, subnode)" + tal:content="subnode/getName"> + Plain Text File Name + </a> + </td> + <td> + <span tal:condition="subnode/getOneLiner|nothing" + tal:content="structure subnode/getOneLiner"> + One line description + </span> + <span tal:condition="not: subnode/getOneLiner|nothing"> + + </span> + </td> + </tr> + + </table> + </tal:block> + + <!-- DUMP ALL OF THE STUFF FOR A PYTHON MODULE --> + <!-- Caller should set up "current_module" variable. --> + <tal:block metal:define-macro="python_module" xmlns:tal="http://xml.zope.org/namespaces/tal" *************** *** 39,43 **** --- 74,87 ---- </tal:block> + <tal:block tal:define="subnodes python: current_module.getSubNodes(['application/x-class']);" + tal:condition="subnodes|nothing"> + <div + metal:use-macro="templates/python_macros.pt/macros/subnode_list"> + <h2 metal:fill-slot="title_slot">Classes</h2> + </div> + </tal:block> + </tal:block> + <p>This template contains the macros for formatting information |
From: Doug H. <dou...@us...> - 2003-03-18 17:22:35
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templates/default In directory sc8-pr-cvs1:/tmp/cvs-serv12753/happydoclib/docset/docset_TAL/templates/default Added Files: README.stx Log Message: Documentation for the default template. --- NEW FILE: README.stx --- Default Template Set This template set is the default view used when the TAL docset is used without specifying an alternate template set. |
From: Doug H. <dou...@us...> - 2003-03-18 17:22:19
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templates In directory sc8-pr-cvs1:/tmp/cvs-serv12578/happydoclib/docset/docset_TAL/templates Added Files: README.stx Log Message: Documentation for the templates directory. --- NEW FILE: README.stx --- TAL Templates This directory contains template sets for the TAL docset plugin to HappyDoc. Each subdirectory contains one full template set. Expected Files Each template must provide at least these files: 'toc.pt' -- Table of contents. This template is used to render each directory table of contents file, usually resulting in an 'index.html' file. 'plain_text.pt' -- Plain text formatter. This template is used to render plain and structured text files which are converted to the output format. Creating a new Template Set - using macros - API available to macros from the docset - writing utility modules |
From: Doug H. <dou...@us...> - 2003-03-18 17:21:56
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib In directory sc8-pr-cvs1:/tmp/cvs-serv12384/happydoclib Modified Files: packagetree.py Log Message: Add getSummaryAndFormat() to CodeObjectTree. Index: packagetree.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/packagetree.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** packagetree.py 16 Mar 2003 23:42:27 -0000 1.9 --- packagetree.py 18 Mar 2003 17:21:52 -0000 1.10 *************** *** 484,487 **** --- 484,494 ---- """ return self.code_info.getDocStringAndFormat() + + def getSummaryAndFormat(self): + """Returns a tuple containing a one line summary of the + documentation for the node and the format of that + string as understood by the docstring converter plugins. + """ + return self.code_info.getSummaryAndFormat() |
From: Doug H. <dou...@us...> - 2003-03-16 23:45:53
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/parsers In directory sc8-pr-cvs1:/tmp/cvs-serv16005/happydoclib/parsers Modified Files: parsers_python.py Log Message: Add a good implementation of getImportData() that looks at the module info for the current node. Index: parsers_python.py =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/parsers/parsers_python.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** parsers_python.py 18 Jan 2003 20:01:51 -0000 1.1 --- parsers_python.py 16 Mar 2003 23:45:40 -0000 1.2 *************** *** 146,149 **** --- 146,152 ---- return self.module_info.getSummaryAndFormat() + def getImportData(self): + return self.module_info.getImportData() + class PythonModuleParser(ParserBase): |
From: Doug H. <dou...@us...> - 2003-03-16 23:45:16
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/regressions In directory sc8-pr-cvs1:/tmp/cvs-serv15848/happydoclib/docstring/StructuredText/regressions Modified Files: examples.stx Log Message: Remove some DTML tags which confuse the TAL code. Index: examples.stx =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docstring/StructuredText/regressions/examples.stx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** examples.stx 17 Nov 2002 00:26:27 -0000 1.1.1.1 --- examples.stx 16 Mar 2003 23:45:12 -0000 1.2 *************** *** 14,23 **** - An inline example: '1+2'. - - Another example with a different format: - ``x='spam''' or ``y='spam''' or ``<dtml-var spam>''.' - - We can use expressions in the DTML var tag as - in ``<dtml-var "x+'.txt'">'' - - A mult-line example:: --- 14,17 ---- *************** *** 25,30 **** *foo bar* - - <dtml-var yeha> --- 19,22 ---- |
From: Doug H. <dou...@us...> - 2003-03-16 23:44:49
|
Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templates/default In directory sc8-pr-cvs1:/tmp/cvs-serv15651/happydoclib/docset/docset_TAL/templates/default Modified Files: toc.pt Log Message: Only spit out each section header if there is going to be something in the section. Include the python module information for the __init__.py file in the current directory, if there is one. Index: toc.pt =================================================================== RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_TAL/templates/default/toc.pt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** toc.pt 16 Mar 2003 20:33:57 -0000 1.2 --- toc.pt 16 Mar 2003 23:44:44 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- python_files python: docset.getPythonSubNodes(node); subdirectories python: node.getSubNodes(['application/x-directory']); + current_module python: node.get('__init__.py', nothing); "> *************** *** 21,86 **** <div tal:replace="structure description">Description</div> ! <hr> ! ! <tal:block tal:condition="other_documentation|nothing"> ! <h2>Other Documentation</h2> ! <table class="descriptive_list"> ! ! <tr tal:repeat="subnode other_documentation"> ! <td><a href="" ! tal:attributes="href python: docset.getHREFToNode(node, subnode)" ! tal:content="subnode/getName"> ! Plain Text File Name ! </a> ! </td> ! <td tal:content="structure subnode/getOneLiner"> ! One line description ! </td> ! </tr> ! ! </table> ! </tal:block> ! <tal:block tal:condition="python_files|nothing"> ! <h2>Python Files</h2> ! <table class="descriptive_list"> ! ! <tr tal:repeat="subnode python_files"> ! <td><a href="" ! tal:attributes="href python: docset.getHREFToNode(node, subnode)" ! tal:content="subnode/getName"> ! Python File Name ! </a> ! </td> ! <td tal:content="structure subnode/getOneLiner"> ! One line description ! </td> ! </tr> ! </table> ! </tal:block> ! <tal:block tal:condition="subdirectories|nothing"> ! <h2>Subdirectories</h2> ! <table class="descriptive_list"> ! ! <tr tal:repeat="subnode subdirectories"> ! <td><a href="" ! tal:attributes="href python: docset.getHREFToNode(node, subnode)" ! tal:content="subnode/getName"> ! Directory Name ! </a> ! </td> ! <td tal:content="structure subnode/getOneLiner"> ! One line description ! </td> ! </tr> ! </table> ! </tal:block> ! </body> --- 22,91 ---- <div tal:replace="structure description">Description</div> ! <tal:block tal:condition="current_module"> ! <div ! metal:use-macro="templates/python_macros.pt/macros/python_module"> ! </div> ! </tal:block> ! <tal:block tal:condition="other_documentation|nothing"> ! <h2>Other Documentation</h2> ! <table class="descriptive_list"> ! <tr tal:repeat="subnode other_documentation"> ! <td><a href="" ! tal:attributes="href python: docset.getHREFToNode(node, subnode)" ! tal:content="subnode/getName"> ! Plain Text File Name ! </a> ! </td> ! <td tal:content="structure subnode/getOneLiner"> ! One line description ! </td> ! </tr> ! </table> ! </tal:block> ! ! <tal:block tal:condition="python_files|nothing"> ! <h2>Python Files</h2> ! ! <table class="descriptive_list"> ! ! <tr tal:repeat="subnode python_files"> ! <td><a href="" ! tal:attributes="href python: docset.getHREFToNode(node, subnode)" ! tal:content="subnode/getName"> ! Python File Name ! </a> ! </td> ! <td tal:content="structure subnode/getOneLiner"> ! One line description ! </td> ! </tr> ! ! </table> ! </tal:block> ! ! <tal:block tal:condition="subdirectories|nothing"> ! <h2>Subdirectories</h2> ! <table class="descriptive_list"> ! <tr tal:repeat="subnode subdirectories"> ! <td><a href="" ! tal:attributes="href python: docset.getHREFToNode(node, subnode)" ! tal:content="subnode/getName"> ! Directory Name ! </a> ! </td> ! <td tal:content="structure subnode/getOneLiner"> ! One line description ! </td> ! </tr> ! </table> ! </tal:block> ! </body> |