Update to SCons 1.2.0.

third_party/scons/scons-local/SCons/Tool/dvipdf.py

 """SCons.Tool.dvipdf
 
 Tool-specific initialization for dvipdf.
 
 There normally shouldn't be any need to import this module directly.
 It will usually be imported through the generic SCons.Tool.Tool()
 selection method.
 
 """
 
@@ skipping 13 matching lines @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Tool/dvipdf.py 3603 2008/10/10 05:46:45 scons"
+__revision__ = "src/engine/SCons/Tool/dvipdf.py 3842 2008/12/20 22:59:52 scons"
 
 import SCons.Action
 import SCons.Defaults
 import SCons.Tool.pdf
 import SCons.Tool.tex
 import SCons.Util
 
-_null = SCons.Tool.tex._Null
+_null = SCons.Scanner.LaTeX._null
 
 def DviPdfPsFunction(XXXDviAction, target = None, source= None, env=None):
     """A builder for DVI files that sets the TEXPICTS environment
        variable before running dvi2ps or dvipdf."""
 
     try:
         abspath = source[0].attributes.path
     except AttributeError :
         abspath =  ''
 
-    saved_env = {}
-    saved_env['TEXPICTS'] = SCons.Tool.tex.modify_env_var(env, 'TEXPICTS', abspath)
+    saved_env = SCons.Scanner.LaTeX.modify_env_var(env, 'TEXPICTS', abspath)
 
     result = XXXDviAction(target, source, env)
 
-    if saved_env['TEXPICTS'] is _null:
+    if saved_env is _null:
         try:
             del env['ENV']['TEXPICTS']
         except KeyError:
             pass # was never set
     else:
-        env['ENV']['TEXPICTS'] = saved_env['TEXPICTS']
+        env['ENV']['TEXPICTS'] = saved_env
 
     return result
 
 def DviPdfFunction(target = None, source= None, env=None):
     result = DviPdfPsFunction(PDFAction,target,source,env)
     return result
 
 def DviPdfStrFunction(target = None, source= None, env=None):
     """A strfunction for dvipdf that returns the appropriate
     command string for the no_exec options."""
@@ skipping 36 matching lines @@
 
     env['DVIPDF']      = 'dvipdf'
     env['DVIPDFFLAGS'] = SCons.Util.CLVar('')
     env['DVIPDFCOM']   = 'cd ${TARGET.dir} && $DVIPDF $DVIPDFFLAGS ${SOURCE.file} ${TARGET.file}'
 
     # Deprecated synonym.
     env['PDFCOM']      = ['$DVIPDFCOM']
 
 def exists(env):
     return env.Detect('dvipdf')