summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2013-12-21 01:30:25 +0100
committerDirk Baechle <dl9obn@darc.de>2013-12-21 01:30:25 +0100
commit2e2105b30765de40379a1235a908fbb5b3f0556c (patch)
tree6e8a1bc5f349b4c0959a41ecfa4a8388b9d80044
parent89122015d5a9a3c87fcba3e4ffc7538419f5aee4 (diff)
downloadscons-2e2105b30765de40379a1235a908fbb5b3f0556c.tar.gz
- removed superfluous import and corrected basic test
-rw-r--r--src/engine/SCons/Tool/docbook/__init__.py1
-rw-r--r--test/Docbook/basic/epub/epub.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/docbook/__init__.py b/src/engine/SCons/Tool/docbook/__init__.py
index a3369921..d14d60bb 100644
--- a/src/engine/SCons/Tool/docbook/__init__.py
+++ b/src/engine/SCons/Tool/docbook/__init__.py
@@ -415,7 +415,6 @@ def DocbookEpub(env, target, source=None, *args, **kw):
"""
import zipfile
import shutil
- from lxml import etree
def build_open_container(target, source, env):
"""Generate the *.epub file from intermediate outputs
diff --git a/test/Docbook/basic/epub/epub.py b/test/Docbook/basic/epub/epub.py
index c819dd78..19e08a0a 100644
--- a/test/Docbook/basic/epub/epub.py
+++ b/test/Docbook/basic/epub/epub.py
@@ -41,7 +41,7 @@ except:
test.dir_fixture('image')
# Normal invocation
-test.run()
+test.run(stderr=None)
test.must_exist(test.workpath('manual.epub'))
test.must_exist(test.workpath('OEBPS','toc.ncx'))
test.must_exist(test.workpath('OEBPS','content.opf'))