From 92016a2b312258f30278f95393b23c5046002f92 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 30 Jan 2013 22:05:46 +0000 Subject: [PATCH] [Cython] Fixed some problems building the Sphinx documentation --- doc/sphinx/cython/importing.rst | 2 +- doc/sphinx/cython/onedim.rst | 4 ++-- interfaces/cython/cantera/onedim.pyx | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/sphinx/cython/importing.rst b/doc/sphinx/cython/importing.rst index fcb7763d4..e1957a882 100644 --- a/doc/sphinx/cython/importing.rst +++ b/doc/sphinx/cython/importing.rst @@ -15,4 +15,4 @@ thermodynamic, chemical kinetic, and (optionally) transport properties. Utility Functions ----------------- -.. autofunction:: addDirectory +.. autofunction:: add_directory diff --git a/doc/sphinx/cython/onedim.rst b/doc/sphinx/cython/onedim.rst index 865150747..008011530 100644 --- a/doc/sphinx/cython/onedim.rst +++ b/doc/sphinx/cython/onedim.rst @@ -11,10 +11,10 @@ Composite Domains Flow Domains ------------ -.. autoclass:: StagnationFlow .. autoclass:: FreeFlow + :inherited-members: .. autoclass:: AxisymmetricStagnationFlow - + :inherited-members: Boundaries ---------- diff --git a/interfaces/cython/cantera/onedim.pyx b/interfaces/cython/cantera/onedim.pyx index 1eadf9e3f..4db9b0025 100644 --- a/interfaces/cython/cantera/onedim.pyx +++ b/interfaces/cython/cantera/onedim.pyx @@ -844,10 +844,9 @@ def _trim(docstring): if indent < 999: for line in lines[1:]: trimmed.append(line[indent:].rstrip()) - # Strip off trailing and leading blank lines: - trimmed = [t for t in trimmed if t] - # Return a single string: - return '\n'.join(trimmed) + + # Return a single string, with trailing and leading blank lines stripped + return '\n'.join(trimmed).strip('\n') def _array_property(attr, size=None): """