diff options
| author | Georg Brandl <georg@python.org> | 2009-08-04 23:37:48 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-08-04 23:37:48 +0200 |
| commit | d152a5ec24e65072108e1f0a87be70e231c54a72 (patch) | |
| tree | eb93d28163af0b6c8d08efe0f4c5fcd0572e2474 | |
| parent | 44209565eb2d2233b355b24d5e267ddeb66d9bbb (diff) | |
| download | sphinx-d152a5ec24e65072108e1f0a87be70e231c54a72.tar.gz | |
Add The Wine Cellar Book.
| -rw-r--r-- | sphinx/__init__.py | 3 | ||||
| -rw-r--r-- | sphinx/builders/__init__.py | 1 | ||||
| -rw-r--r-- | sphinx/ext/inheritance_diagram.py | 1 | ||||
| -rw-r--r-- | sphinx/roles.py | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 41017014..9ba8282a 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -12,8 +12,7 @@ import sys from os import path -__revision__ = '$Revision$' -__version__ = '1.0' +__version__ = '1.0pre' __released__ = '1.0 (hg)' package_dir = path.abspath(path.dirname(__file__)) diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index ca3c1147..08628c7b 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -55,7 +55,6 @@ class Builder(object): self.init() # helper methods - def init(self): """ Load necessary templates and perform initialization. The default diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py index 9c037c99..483c774a 100644 --- a/sphinx/ext/inheritance_diagram.py +++ b/sphinx/ext/inheritance_diagram.py @@ -49,6 +49,7 @@ except ImportError: from docutils import nodes from docutils.parsers.rst import directives +# XXX needs to be adapted from sphinx.roles import xfileref_role from sphinx.ext.graphviz import render_dot_html, render_dot_latex from sphinx.util.compat import Directive diff --git a/sphinx/roles.py b/sphinx/roles.py index 8833c275..61d80922 100644 --- a/sphinx/roles.py +++ b/sphinx/roles.py @@ -54,6 +54,7 @@ def indexmarkup_role(typ, rawtext, etext, lineno, inliner, indexnode['entries'] = [('single', text, targetid, text), ('single', _('environment variable; %s') % text, targetid, text)] + # XXX needs to be adapted xref_nodes = xfileref_role(typ, rawtext, etext, lineno, inliner, options, content)[0] return [indexnode, targetnode] + xref_nodes, [] |