diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-01 13:23:10 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-01 13:23:10 +0200 |
| commit | 0414abd565dbdf12ea741930bef5268bc7fe6da3 (patch) | |
| tree | aa7e983f81ffe2090fa31869b6670bf18bcc28a0 /engine/SCons/Tool/gs.py | |
| parent | 3765e33b76c51c81dd7bbbfacab0c4e76a1713cb (diff) | |
| parent | 3bab2962eecc24c19366692e52ebca5eb835d117 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'engine/SCons/Tool/gs.py')
| -rw-r--r-- | engine/SCons/Tool/gs.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/SCons/Tool/gs.py b/engine/SCons/Tool/gs.py index 77a49fc..ec5ab27 100644 --- a/engine/SCons/Tool/gs.py +++ b/engine/SCons/Tool/gs.py @@ -9,7 +9,7 @@ selection method. """ # -# Copyright (c) 2001 - 2016 The SCons Foundation +# Copyright (c) 2001 - 2017 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/gs.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" +__revision__ = "src/engine/SCons/Tool/gs.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" import SCons.Action import SCons.Builder @@ -62,12 +62,12 @@ def generate(env): if GhostscriptAction is None: GhostscriptAction = SCons.Action.Action('$GSCOM', '$GSCOMSTR') - import pdf + from SCons.Tool import pdf pdf.generate(env) bld = env['BUILDERS']['PDF'] bld.add_action('.ps', GhostscriptAction) - except ImportError, e: + except ImportError as e: pass gsbuilder = SCons.Builder.Builder(action = SCons.Action.Action('$GSCOM', '$GSCOMSTR')) |