Give env to builder.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@5187 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 6 insertions, 4 deletions

diff --git a/sandbox/py-rest-doc/sphinx/builder.py b/sandbox/py-rest-doc/sphinx/builder.py
index b09f0f266..d26a77f34 100644
--- a/sandbox/py-rest-doc/sphinx/builder.py
+++ b/sandbox/py-rest-doc/sphinx/builder.py
@@ -73,7 +73,7 @@ class Builder(object):
         'freshenv': 'Don\'t use a pickled environment',
     }
 
-    def __init__(self, srcdirname, outdirname, options,
+    def __init__(self, srcdirname, outdirname, options, env=None,
                  status_stream=None, warning_stream=None):
         self.srcdir = srcdirname
         self.outdir = outdirname
@@ -81,6 +81,9 @@ class Builder(object):
         self.options = attrdict(options)
         self.validate_options()
 
+        # probably set in load_env()
+        self.env = env
+
         self.config = {}
         execfile(path.join(srcdirname, 'conf.py'), self.config)
         # remove potentially pickling-problematic values
@@ -94,9 +97,6 @@ class Builder(object):
 
         self.init()
 
-        # filled in later
-        self.env = None
-
     # helper methods
 
     def validate_options(self):
@@ -137,6 +137,8 @@ class Builder(object):
     def load_env(self):
         """Set up the build environment. Return True if a pickled file could be
            successfully loaded, False if a new environment had to be created."""
+        if self.env:
+            return
         if not self.options.freshenv:
             try:
                 self.msg('trying to load pickled env...', nonl=True)