gminick / sphinx-gsoc2009 / changeset / 86c93db9ac31

Up to file-list sphinx/builders/__init__.py:

@@ -15,9 +15,7 @@ from os import path
 from docutils import nodes
 from sphinx import package_dir, locale
 from sphinx.util import SEP, relative_uri
 from sphinx.environment import BuildEnvironment
 from sphinx.util.console import bold, purple, darkgreen, term_width_line
 # side effect: registers roles and directives
@@ -25,9 +23,6 @@ from sphinx import roles
 from sphinx import directives
 ENV_PICKLE_FILENAME = 'environment.pickle'
 class Builder(object):
     """
     Builds target formats from the reST sources.
@@ -38,7 +33,8 @@ class Builder(object):
     # builder's output format, or '' if no document output is produced
     format = ''
-    def __init__(self, app, env=None, freshenv=False):
+    def __init__(self, app):
         self.env = app.env
         self.srcdir = app.srcdir
         self.confdir = app.confdir
         self.outdir = app.outdir
@@ -50,18 +46,13 @@ class Builder(object):
         self.warn = app.warn
         self.info = app.info
         self.config = app.config
         self.load_i18n()
         self.tags = app.tags
         self.tags.add(self.format)
         # images that need to be copied over (source -> dest)
         self.images = {}
         # if None, this is set in load_env()
         self.env = env
         self.freshenv = freshenv
         self.init()
         self.load_env()
     # helper methods
@@ -167,50 +158,6 @@ class Builder(object):
     # build methods
     def load_i18n(self):
         """
         Load translated strings from the configured localedirs if
         enabled in the configuration.
         """
         if self.config.language is not None:
             self.info(bold('loading translations [%s]... ' %
                            self.config.language), nonl=True)
             locale_dirs = [None, path.join(package_dir, 'locale')] + \
                 [path.join(self.srcdir, x) for x in self.config.locale_dirs]
         else:
             locale_dirs = []
         self.translator, has_translation = locale.init(locale_dirs,
                                                        self.config.language)
         if self.config.language is not None:
             if has_translation:
                 self.info('done')
             else:
                 self.info('locale not available')
     def load_env(self):
         """Set up the build environment."""
         if self.env:
             return
         if not self.freshenv:
             try:
                 self.info(bold('loading pickled environment... '), nonl=True)
                 self.env = BuildEnvironment.frompickle(self.config,
                     path.join(self.doctreedir, ENV_PICKLE_FILENAME))
                 self.info('done')
             except Exception, err:
                 if type(err) is IOError and err.errno == 2:
                     self.info('not found')
                 else:
                     self.info('failed: %s' % err)
                 self.env = BuildEnvironment(self.srcdir, self.doctreedir,
                                             self.config)
                 self.env.find_files(self.config)
         else:
             self.env = BuildEnvironment(self.srcdir, self.doctreedir,
                                         self.config)
             self.env.find_files(self.config)
         self.env.set_warnfunc(self.warn)
     def build_all(self):
         """Build all source files."""
         self.build(None, summary='all source files', method='all')
@@ -290,6 +237,7 @@ class Builder(object):
         if updated_docnames:
             # save the environment
             from sphinx.application import ENV_PICKLE_FILENAME
             self.info(bold('pickling environment... '), nonl=True)
             self.env.topickle(path.join(self.doctreedir, ENV_PICKLE_FILENAME))
             self.info('done')

Up to file-list sphinx/builders/html.py:

@@ -33,7 +33,8 @@ from sphinx.util import SEP, os_path, re
 from sphinx.errors import SphinxError
 from sphinx.search import js_index
 from sphinx.theming import Theme
-from sphinx.builders import Builder, ENV_PICKLE_FILENAME
+from sphinx.builders import Builder
 from sphinx.application import ENV_PICKLE_FILENAME
 from sphinx.highlighting import PygmentsBridge
 from sphinx.util.console import bold
 from sphinx.writers.html import HTMLWriter, HTMLTranslator, \
@@ -239,7 +240,9 @@ class StandaloneHTMLBuilder(Builder):
         rellinks = []
         if self.config.html_use_index:
             rellinks.append(('genindex', _('General Index'), 'I', _('index')))
-        if self.config.html_use_modindex and self.env.modules:
+        # XXX generalization of modindex?
         if self.config.html_use_modindex and \
                 self.env.domaindata['py']['modules']:
             rellinks.append(('modindex', _('Global Module Index'),
                              'M', _('modules')))
@@ -404,12 +407,13 @@ class StandaloneHTMLBuilder(Builder):
         # the global module index
-        if self.config.html_use_modindex and self.env.modules:
+        moduleindex = self.env.domaindata['py']['modules']
         if self.config.html_use_modindex and moduleindex:
             # the sorted list of all modules, for the global module index
             modules = sorted(((mn, (self.get_relative_uri('modindex', fn) +
                                     '#module-' + mn, sy, pl, dep))
                               for (mn, (fn, sy, pl, dep)) in
-                              self.env.modules.iteritems()),
+                              moduleindex.iteritems()),
                              key=lambda x: x[0].lower())
             # collect all platforms
             platforms = set()
@@ -709,14 +713,15 @@ class StandaloneHTMLBuilder(Builder):
         self.info(bold('dumping object inventory... '), nonl=True)
         f = open(path.join(self.outdir, INVENTORY_FILENAME), 'w')
         try:
             # XXX inventory version 2
             f.write('# Sphinx inventory version 1\n')
             f.write('# Project: %s\n' % self.config.project.encode('utf-8'))
             f.write('# Version: %s\n' % self.config.version)
             for modname, info in self.env.modules.iteritems():
                 f.write('%s mod %s\n' % (modname, self.get_target_uri(info[0])))
             for refname, (docname, desctype) in self.env.descrefs.iteritems():
                 f.write('%s %s %s\n' % (refname, desctype,
-                                        self.get_target_uri(docname)))
+            #for modname, info in self.env.modules.iteritems():
             #    f.write('%s mod %s\n' % (modname, self.get_target_uri(info[0])))
             #for refname, (docname, desctype) in self.env.descrefs.iteritems():
             #    f.write('%s %s %s\n' % (refname, desctype,
             #                            self.get_target_uri(docname)))
         finally:
             f.close()
         self.info('done')

commit 1604:	86c93db9ac31
parent 1603:	9fe02ac5ee25
parent 1602:	5be2fe52a100
branch:	default