He said, "'Quoted' words in a larger quote."
+ s = double_quote_sets_re.sub("\x01\x03", s) + s = single_quote_sets_re.sub("\x03\x01", s) + + # Special case for decade abbreviations (the '80s): + s = decade_abbr_re.sub("\x04", s) + + s = opening_single_quotes_regex.sub("\\1\x03", s) + s = closing_single_quotes_regex.sub("\\1\x04", s) + s = closing_single_quotes_regex_2.sub("\\1\x04\\2", s) + + # Any remaining single quotes should be opening ones: + s = s.replace("'", "\x03") + + s = opening_double_quotes_regex.sub("\\1\x01", s) + s = closing_double_quotes_regex.sub("\x02", s) + s = closing_double_quotes_regex_2.sub("\\1\x02", s) + + # Any remaining quotes should be opening ones. + s = s.replace('"', "\x01") + + # Finally, replace all helpers with quotes. + return s.replace("\x01", "``").replace("\x02", "''").\ + replace("\x03", "`").replace("\x04", "'") + + def educateBackticks(s): """ Parameter: String. From python-checkins at python.org Sun May 4 10:28:00 2008 From: python-checkins at python.org (georg.brandl) Date: Sun, 4 May 2008 10:28:00 +0200 (CEST) Subject: [Python-checkins] r62694 - doctools/trunk/sphinx/application.py Message-ID: <20080504082800.81B541E4015@bag.python.org> Author: georg.brandl Date: Sun May 4 10:28:00 2008 New Revision: 62694 Log: Document class. Modified: doctools/trunk/sphinx/application.py Modified: doctools/trunk/sphinx/application.py ============================================================================== --- doctools/trunk/sphinx/application.py (original) +++ doctools/trunk/sphinx/application.py Sun May 4 10:28:00 2008 @@ -222,7 +222,8 @@ class TemplateBridge(object): """ - + This class defines the interface for a "template bridge", that is, a class + that renders templates given a template name and a context. """ def init(self, builder): From python-checkins at python.org Sun May 4 11:07:51 2008 From: python-checkins at python.org (georg.brandl) Date: Sun, 4 May 2008 11:07:51 +0200 (CEST) Subject: [Python-checkins] r62695 - in doctools/trunk: doc/ext/autodoc.rst sphinx/ext/autodoc.py Message-ID: <20080504090751.8F1861E4013@bag.python.org> Author: georg.brandl Date: Sun May 4 11:07:51 2008 New Revision: 62695 Log: #2656: autodoc now skips inherited members unless the :inherited-members: flag is given. Modified: doctools/trunk/doc/ext/autodoc.rst doctools/trunk/sphinx/ext/autodoc.py Modified: doctools/trunk/doc/ext/autodoc.rst ============================================================================== --- doctools/trunk/doc/ext/autodoc.rst (original) +++ doctools/trunk/doc/ext/autodoc.rst Sun May 4 11:07:51 2008 @@ -63,6 +63,10 @@ Members without docstrings will be left out, unless you give the ``undoc-members`` flag option. + .. versionadded:: 0.2.1 + For classes and exceptions, members inherited from base classes will be + left out, unless you give the ``inherited-members`` flag option. + The "auto" directives can also contain content of their own, it will be inserted into the resulting non-auto directive source after the docstring (but before any automatic member documentation). Modified: doctools/trunk/sphinx/ext/autodoc.py ============================================================================== --- doctools/trunk/sphinx/ext/autodoc.py (original) +++ doctools/trunk/sphinx/ext/autodoc.py Sun May 4 11:07:51 2008 @@ -78,8 +78,8 @@ return charset -def generate_rst(what, name, members, undoc, add_content, document, lineno, - indent='', filename_set=None, check_module=False): +def generate_rst(what, name, members, inherited, undoc, add_content, document, + lineno, indent='', filename_set=None, check_module=False): env = document.settings.env # find out what to import @@ -162,7 +162,7 @@ result.append(indent + '.. %s:: %s%s' % (what, qualname, args), 'Parts of the documentation:
- What's new in Python {{ version }}? What's new in Python {{ version }}? Tutorial Tutorial Using Python Language Reference Library Reference Python HOWTOs |
- Extending and Embedding Python/C API Installing Python Modules Distributing Python Modules Documenting Python |
Indices and tables:
- Global Module Index General Index Glossary Glossary |
- Search page Complete Table of Contents |