Thanks. Finding the bug why it does not work anymore was on my TODO list
On 04.10.2011 01:53, Jason Tackaberry wrote:
> Author: tack
> Date: Mon Oct 3 19:53:18 2011
> New Revision: 4556
>
> Log:
> Fix document generation regressions.
>
>
> Modified:
> trunk/base/doc/Makefile
> trunk/base/doc/conf.py
> trunk/base/src/distribution/sphinxext.py
>
> Modified: trunk/base/doc/Makefile
> ==============================================================================
> --- trunk/base/doc/Makefile (original)
> +++ trunk/base/doc/Makefile Mon Oct 3 19:53:18 2011
> @@ -25,7 +25,7 @@
> clean:
> -rm -rf .build/* html/*
>
> -html:
> +html: clean
> mkdir -p html .build/doctrees
> $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) html
> @echo
>
> Modified: trunk/base/doc/conf.py
> ==============================================================================
> --- trunk/base/doc/conf.py (original)
> +++ trunk/base/doc/conf.py Mon Oct 3 19:53:18 2011
> @@ -11,14 +11,16 @@
> # All configuration values have a default value; values that are commented
> out
> # serve to show the default value.
>
> -import sys, os
> +import sys, os, glob, platform
>
> # If your extensions are in another directory, add it here. If the directory
> # is relative to the documentation root, use os.path.abspath to make it
> # absolute, like shown here.
> -for _lib in os.listdir('../build'):
> - if _lib.startswith('lib.'):
> - sys.path.insert(0, os.path.abspath('../build/' + _lib))
> +[sys.path.remove(x) for x in sys.path[:] if '/kaa' in x and x != os.getcwd()]
> +for _lib in glob.glob('../build/lib.*%s*/kaa' % platform.machine()):
> + sys.path.insert(0, os.path.abspath(_lib))
> +
> +sys.modules['kaa'] = sys.modules['kaa.base'] = __import__('base')
> from kaa.version import VERSION
>
> # General configuration
> @@ -26,7 +28,7 @@
>
> # Add any Sphinx extension module names here, as strings. They can be
> extensions
> # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
> -extensions = [ 'sphinx.ext.autodoc', 'kaa.distribution.sphinxext' ]
> +extensions = [ 'sphinx.ext.autodoc', 'kaa.base.distribution.sphinxext' ]
>
> # Add any paths that contain templates here, relative to this directory.
> templates_path = ['_templates']
>
> Modified: trunk/base/src/distribution/sphinxext.py
> ==============================================================================
> --- trunk/base/src/distribution/sphinxext.py (original)
> +++ trunk/base/src/distribution/sphinxext.py Mon Oct 3 19:53:18 2011
> @@ -184,7 +184,7 @@
> from docutils.parsers.rst import directives
>
> # Kaa imports
> -from kaa.object import get_all_signals
> +from kaa.core import Object
>
>
> # Custom nodes
> @@ -252,11 +252,11 @@
>
> def get_signals(cls, inherit, add, remove):
> if inherit:
> - signals = get_all_signals(cls)
> + signals = Object._get_all_signals(cls)
> else:
> signals = getattr(cls, '__kaasignals__', {}).copy()
> if add:
> - all = get_all_signals(cls)
> + all = Object._get_all_signals(cls)
> for key in add:
> signals[key] = all[key]
>
> @@ -305,10 +305,16 @@
> fullname = '%s.%s' % (mod.rsplit('.', i)[0], name)
> try:
> get_class(fullname)
> - return fullname
> + break
> except (ImportError, AttributeError):
> pass
> - return '%s.%s' % (mod, name)
> + else:
> + fullname = '%s.%s' % (mod, name)
> +
> + # Special exception for kaa.base: rename 'base' to 'kaa'
> + if fullname.startswith('base.'):
> + fullname = 'kaa' + fullname[4:]
> + return fullname
>
>
> def append_class_hierarchy(node, state, cls, level=0, clstree=None):
>
> ------------------------------------------------------------------------------
> All the data continuously generated in your IT infrastructure contains a
> definitive record of customers, application performance, security
> threats, fraudulent activity and more. Splunk takes this data and makes
> sense of it. Business sense. IT sense. Common sense.
> http://p.sf.net/sfu/splunk-d2dcopy1
> _______________________________________________
> Freevo-cvslog mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
>
>
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Freevo-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-devel
