Make xls-dump.py errors less noisy, hopefully avoiding system reports on Fedora

This commit is contained in:
Jean-Francois Dockes 2014-12-18 15:35:42 +01:00
parent bfed6cb41a
commit cf33d7531c

View File

@ -77,23 +77,28 @@ class XLDumper(object):
node.prettyPrint(sys.stdout, docroot, utf8 = self.params.utf8) node.prettyPrint(sys.stdout, docroot, utf8 = self.params.utf8)
def dumpCanonicalXML (self): def dumpCanonicalXML (self):
self.__parseFile() try:
docroot = node.Root() self.__parseFile()
root = docroot.appendElement('xls-dump') docroot = node.Root()
root = docroot.appendElement('xls-dump')
dirEntries = self.strm.getDirectoryEntries() dirEntries = self.strm.getDirectoryEntries()
for entry in dirEntries: for entry in dirEntries:
dirname = entry.Name dirname = entry.Name
if dirname != "Workbook": if dirname != "Workbook":
# for now, we only dump the Workbook directory stream. # for now, we only dump the Workbook directory stream.
continue continue
dirstrm = self.strm.getDirectoryStream(entry) dirstrm = self.strm.getDirectoryStream(entry)
wbmodel = self.__buildWorkbookModel(dirstrm) wbmodel = self.__buildWorkbookModel(dirstrm)
wbmodel.encrypted = self.strmData.encrypted wbmodel.encrypted = self.strmData.encrypted
root.appendChild(wbmodel.createDOM()) root.appendChild(wbmodel.createDOM())
node.prettyPrint(sys.stdout, docroot, utf8 = self.params.utf8) node.prettyPrint(sys.stdout, docroot, utf8 = self.params.utf8)
except Exception as err:
print >> sys.stderr, "xls-dump.py: error: %s" % err
sys.exit(1)
def dump (self): def dump (self):
self.__parseFile() self.__parseFile()