summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2013-12-21 00:30:25 (GMT)
committerDirk Baechle <dl9obn@darc.de>2013-12-21 00:30:25 (GMT)
commitea7ee956f90e6a48aeb88a7952ac19e6fd0a6606 (patch)
tree6e8a1bc5f349b4c0959a41ecfa4a8388b9d80044
parenta9edc15a5ac66ba8794e66e8e9c0a1f926009220 (diff)
downloadSCons-ea7ee956f90e6a48aeb88a7952ac19e6fd0a6606.zip
SCons-ea7ee956f90e6a48aeb88a7952ac19e6fd0a6606.tar.gz
SCons-ea7ee956f90e6a48aeb88a7952ac19e6fd0a6606.tar.bz2
- 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 a336992..d14d60b 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 c819dd7..19e08a0 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'))